Skip to content

Commit f78ac49

Browse files
authored
Merge pull request scp-fs2open#7195 from Goober5000/timestamp_elapsed_fix
fix two timestamp bugs
2 parents 1a7ee07 + 66a07fe commit f78ac49

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

code/io/timer.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,9 @@ bool timestamp_elapsed(int stamp) {
489489
if (stamp == 0) {
490490
return false;
491491
}
492+
if (stamp == 1) {
493+
return true;
494+
}
492495

493496
return timestamp_ms() >= stamp;
494497
}
@@ -539,6 +542,9 @@ bool ui_timestamp_elapsed_last_frame(UI_TIMESTAMP ui_stamp) {
539542

540543
bool timestamp_elapsed_safe(int a, int b) {
541544
if (a == 0) {
545+
return false;
546+
}
547+
if (a == 1) {
542548
return true;
543549
}
544550

0 commit comments

Comments
 (0)