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.

Sign up for GitHub

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

Jump to bottom

Game flow rework (pt 3) #2364

Merged
merged 6 commits into from
Jan 24, 2025
Merged

Game flow rework (pt 3) #2364

merged 6 commits into from
Jan 24, 2025

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Jan 23, 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

  • TR2: cutscenes are now GAME_FLOW_LEVEL and have their own sequences
  • TR2: replaced GFS_SET_MUSIC_TRACK with a dedicated music_track property
  • TR2: removed title_music_track property as it's now superseded with music_track property of the title level
  • TR2: changed demos to internally use their own indices rather than main game level indices
  • TR2: level APIs moved from decomp.c to level.c

@rr- rr- added Internal The invisible stuff TR2 labels Jan 23, 2025
@rr- rr- self-assigned this Jan 23, 2025
@rr- rr- requested review from a team as code owners January 23, 2025 15:12
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 23, 2025 15:12
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 23, 2025 •
edited
Loading

Download the built assets for this pull request:

lahm86
lahm86 reviewed Jan 23, 2025
View reviewed changes
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.

If you complete GW and skip the stats screen before the music finishes, it cuts off whereas it continue into Venice in OG (same for Venice to Bartoli, Tibet to Barkhang). Similar issue that we had in #2260.

@rr-
Copy link
Collaborator Author

rr- commented Jan 23, 2025

If you complete GW and skip the stats screen before the music finishes, it cuts off whereas it continue into Venice in OG (same for Venice to Bartoli, Tibet to Barkhang). Similar issue that we had in #2260.

Thank you – fixed.

@rr- rr- merged commit 058809a into develop Jan 24, 2025
8 checks passed
@rr- rr- deleted the tr2-game-flow branch January 24, 2025 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aredfan aredfan aredfan approved these changes

@lahm86 lahm86 lahm86 approved these changes

@walkawayy walkawayy Awaiting requested review from walkawayy walkawayy is a code owner automatically assigned from LostArtefacts/dev

Assignees

@rr- rr-

Labels
Internal The invisible stuff TR2
Projects
TRX Dev tracker
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rr- @lahm86 @aredfan