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

Game flow rework (pt 7) #2388

Merged
merged 4 commits into from
Jan 25, 2025
Merged

Game flow rework (pt 7) #2388

merged 4 commits into from
Jan 25, 2025

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Jan 25, 2025

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change
  • I have added a readme entry about my new feature or OG bug fix, or it is a different change

Description

This moves the cutscenes in TR1 to its own key. There are several things that needed to be done to make this work:

  • Removes GFS_EXIT_TO_CUTSCENE
  • Introduces GFS_PLAY_CUTSCENE from TR2
  • Introduces GFL_DUMMY so that we don't have to change the level count in the main level list (needed for the legacy saves), and at the same time we don't need to provide all the usual information such as paths and whatnot for those levels. I'll later try to remove this type altogether with some heuristics in the savegame reader, but not now.
  • Technically fixes some insignificant memory leaks when shutting down both TR1 and TR2.

@rr- rr- added Internal The invisible stuff TR1 labels Jan 25, 2025
@rr- rr- self-assigned this Jan 25, 2025
@rr- rr- requested review from a team as code owners January 25, 2025 19:23
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 25, 2025 19:23
@rr- rr- added the TR2 label Jan 25, 2025
@lahm86
Copy link
Collaborator

lahm86 commented Jan 25, 2025

The end of level stats don't show after the Qualopec cutscene. They appear fine after Tihocan and Atlantis cutscenes though.

@lahm86
Copy link
Collaborator

lahm86 commented Jan 25, 2025

Sorry, another issue is if you save in Qualopec, reload, then finish the level, the cutscene doesn't show (but the stats do).

@rr-
Copy link
Collaborator Author

rr- commented Jan 25, 2025

Thanks @lahm86 fixed both issues.

Copy link
Collaborator

@lahm86 lahm86 left a comment

Choose a reason for hiding this comment

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

Thanks. LGTM

@rr- rr- merged commit fe49300 into develop Jan 25, 2025
9 checks passed
@rr- rr- deleted the tr2-game-flow branch January 25, 2025 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Internal The invisible stuff TR1 TR2
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants