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/lara: revert camera after extra anim unless heavy #1722

Merged

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Oct 16, 2024

Resolves #1580.

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

The Lara_State_Extra_Breath function serves as a bridging animation between an extra animation and Lara returning to normal. This change will respect any heavy camera triggers set during the extra animation rather than blindly resetting to chase type. So as a result it fixes the gong camera in Ice Palace.

For testing, we can check WadTool where this could apply elsewhere. Any Lara misc animation that has the next anim set to 0 is relevant:

image

So this gives the following. The camera should return to normal after these animations.

  • Bartoli detonator
  • Offshore start
  • Offshore wheel door
  • Pulling the dagger (although slightly different, as Lara herself activates the exit door camera here)
  • HSH start (same again, Lara triggers a camera after the start anim)

The Lara_State_Extra_Breath function serves as a bridging animation
between an extra animation and Lara returning to normal. This change
will respect any heavy camera triggers set during the extra animation
rather than blindly resetting to chase type.

Resolves LostArtefacts#1580.
@lahm86 lahm86 added OG bug A bug in original game TR2 labels Oct 16, 2024
@lahm86 lahm86 self-assigned this Oct 16, 2024
@lahm86 lahm86 requested review from a team as code owners October 16, 2024 12:55
@lahm86 lahm86 requested review from rr-, walkawayy and aredfan and removed request for a team October 16, 2024 12:55
Copy link
Collaborator

@aredfan aredfan left a comment

Choose a reason for hiding this comment

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

I've checked all the animations listed in the OP, all LGTM.

Thank you @lahm86. 👍

@lahm86 lahm86 merged commit 79fcac2 into LostArtefacts:develop Oct 16, 2024
5 checks passed
@lahm86 lahm86 deleted the issue-1580-extra-test-heavy-cam branch October 16, 2024 18:33
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
Development

Successfully merging this pull request may close these issues.

OG bug: cinematic camera issue when Lara strikes the gong | Ice Palace
3 participants