Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

convert event-related timestamps to new system #4633

Merged
merged 2 commits into from
Sep 22, 2022

Conversation

Goober5000
Copy link
Contributor

This change covers just the timestamps associated with goals and events, for better review and isolation purposes.

Follow-up to #4569.

@Goober5000 Goober5000 added cleanup A modification or rewrite of code to make it more understandable or easier to maintain. timer/timestamp Having to do with how time and timestamps are managed labels Sep 9, 2022
@Goober5000 Goober5000 force-pushed the event_and_goal_timestamps branch 5 times, most recently from 9a0734f to c072088 Compare September 13, 2022 02:01
@Goober5000 Goober5000 marked this pull request as ready for review September 14, 2022 01:37
@Goober5000
Copy link
Contributor Author

After extensive testing and fixing several bugs, this is now ready for review.

This change covers just the timestamps associated with goals and events, for better review and isolation purposes.

Follow-up to scp-fs2open#4569.
Copy link
Member

@BMagnu BMagnu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks mostly good.
As this is fairly deep in the logic, it's gonna need a lot of testing, but it sounds like you did that.
This interval behaviour will need to be well-documented on the respective wiki page as well.
One question though

code/mission/missiongoals.cpp Show resolved Hide resolved
@Goober5000 Goober5000 merged commit 2b1e084 into scp-fs2open:master Sep 22, 2022
@Goober5000 Goober5000 deleted the event_and_goal_timestamps branch September 22, 2022 22:51
Goober5000 added a commit to Goober5000/fs2open.github.com that referenced this pull request Nov 30, 2022
Two situations in the event timestamp life cycle, chain delays and event status delays, require accommodation for the timestamp-plus-interval case described in `mission_process_event()`.  Commit 06fc8c7 applied the fix for chain delays; this applies the same fix to event status delays.

Follow-up to scp-fs2open#4633.  Fixes scp-fs2open#4951.
Goober5000 added a commit to Goober5000/fs2open.github.com that referenced this pull request Aug 7, 2024
Fix units are denominated in seconds, while timestamp units are denominated in milliseconds.  This fixes the directive timing check which, after the timestamp upgrade, would time out after 5 and 7 milliseconds instead of 5 and 7 seconds.

Follow-up to scp-fs2open#4633.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cleanup A modification or rewrite of code to make it more understandable or easier to maintain. timer/timestamp Having to do with how time and timestamps are managed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants