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 5) #2375

Merged
merged 11 commits into from
Jan 25, 2025
Merged

Game flow rework (pt 5) #2375

merged 11 commits into from
Jan 25, 2025

Conversation

rr-
Copy link
Collaborator

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

  • Chiefly, this PR tries to somehow tame the split of the level arrays in TR2. TR1 still uses a linear array.
  • Makes g_CurrentLevel a pointer to GAME_FLOW_LEVEL (TR2 only)
  • Changes GF_GetLevelCount() signature to accept GAME_FLOW_LEVEL_TYPE
  • Introduces GAME_FLOW_LEVEL *GF_GetLevel(int32_t num, GAME_FLOW_LEVEL_TYPE level_type)
  • Moves MUSIC_TRACK to libtrx
  • Merges common game flow types in libtrx
  • Adds ability for game string tables to define demos and cutscene specific strings (TR2 only)
  • Fixes TR2 /pos returning weird names in demos and cutscenes

Sorry, something went wrong.

@rr- rr- added Internal The invisible stuff TR2 TR1 labels Jan 24, 2025
@rr- rr- self-assigned this Jan 24, 2025
@rr- rr- requested review from a team as code owners January 24, 2025 15:58
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 24, 2025 15:58
@rr- rr- changed the title Rework game flow (pt 5) Game flow rework (pt 5) Jan 24, 2025
@aredfan
Copy link
Collaborator

aredfan commented Jan 24, 2025

TR2X crashes when cutscenes finishes or gets skipped, for example:

  1. /play 1
  2. use the level skip cheat
  3. skip the cutscene

@lahm86
Copy link
Collaborator

lahm86 commented Jan 24, 2025

Lara's Home appears in the title screen in TRUB if you play a level and then return to the title screen - I admit I didn't check this in the last PR and it looks like it's happening there too, I can raise an issue if you prefer as it's not directly related to this one.

@rr-
Copy link
Collaborator Author

rr- commented Jan 24, 2025

Lara's Home appears in the title screen in TRUB if you play a level and then return to the title screen - I admit I didn't check this in the last PR and it looks like it's happening there too, I can raise an issue if you prefer as it's not directly related to this one.

I'll tackle this here, as it's a regression in develop only.
Edit: broken here – 717e045 inv-ring: create INV_RING_SOURCE

@rr-
Copy link
Collaborator Author

rr- commented Jan 25, 2025

@aredfan @lahm86 this is now ready for a re-review.

@rr- rr- merged commit 529d482 into develop Jan 25, 2025
8 checks passed
@rr- rr- deleted the tr2-game-flow branch January 25, 2025 10:30
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
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants