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 4) #2371

Merged
merged 9 commits into from
Jan 24, 2025
Merged

Game flow rework (pt 4) #2371

merged 9 commits into from
Jan 24, 2025

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Jan 24, 2025 •
edited
Loading

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

  • Tries to make the APIs a bit more common (though we're still miles away from reaching actual parity)
  • TR1: adds num to GAME_FLOW_LEVEL
  • TR1: changes the sequencer to have its memory allocated only once, like TR2
  • TR1: greatly simplifies water and draw distances override mechanisms
  • TR1: moves FMVs to a dedicated JSON key; replaces the path argument with fmv_id
  • TR1+TR2: changes certain JSON key names to match
  • TR2: fixes freeing level data
  • TR1+TR2: allow all object IDs to be specified with both an integer and a string

@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 12:59
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 24, 2025 12:59
@github-actions GitHub Actions
Copy link

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

Download the built assets for this pull request:

lahm86
lahm86 reviewed Jan 24, 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.

LGTM. Just a tiny nitpick (although arguably unrelated to this change).

src/tr1/game/level.c Outdated
static void M_MarkWaterEdgeVertices(void);
static size_t M_CalculateMaxVertices(void);

static void M_LoadFromFile(
const char *filename, int32_t level_num, bool is_demo)
static void M_LoadFromFile(const GAME_FLOW_LEVEL *const level, bool is_demo)
Copy link
Collaborator

Choose a reason for hiding this comment

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

const bool

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Adjusted

@aredfan
Copy link
Collaborator

aredfan commented Jan 24, 2025 •
edited
Loading

TR1X issues:

  • Lara appear to have her holsters in the gym level.
  • TRUB shows this message when I try to launch it.
    Screenshot

@rr-
Copy link
Collaborator Author

rr- commented Jan 24, 2025

@aredfan thank you – addressed both problems.

@rr- rr- merged commit 6a261d2 into develop Jan 24, 2025
8 checks passed
@rr- rr- deleted the tr2-game-flow branch January 24, 2025 15:01
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 TR1 TR2
Projects
TRX Dev tracker
Status: Done
Milestone
No milestone
Development

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