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

tr2/objects/final_level_counter: fix final cutscene issues #1993

Merged
merged 2 commits into from
Dec 8, 2024

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Dec 8, 2024

Resolves #1701.
Resolves #1992.

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

Description

Fixes issues with flares before the final cutscene, and the softlock if Lara is on water surface. Separate commits, which I'll retain on merge rather than squashing - as the issues are semi-related, I thought it would be easier to do one PR.

This ensures Lara's water status is reset before starting the final
cutscene.

Resolves LostArtefacts#1701.
This will discard a flare if Lara has one active before triggering the
final cutscene in Home Sweet Home, and reset Lara's hands accordingly.

Resolves LostArtefacts#1992.
@lahm86 lahm86 added OG bug A bug in original game TR2 labels Dec 8, 2024
@lahm86 lahm86 self-assigned this Dec 8, 2024
@lahm86 lahm86 requested review from a team as code owners December 8, 2024 12:30
@lahm86 lahm86 requested review from rr-, walkawayy and aredfan and removed request for a team December 8, 2024 12:30
Copy link

github-actions bot commented Dec 8, 2024

@lahm86 lahm86 merged commit a590de2 into LostArtefacts:develop Dec 8, 2024
6 checks passed
@lahm86 lahm86 deleted the fix-hsh-cutscene-issues branch December 8, 2024 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OG bug A bug in original game TR2
Projects
Archived in project
3 participants