Skip to content

Commit

Permalink
tr2/lara: revert camera after extra anim unless heavy
Browse files Browse the repository at this point in the history
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 #1580.
  • Loading branch information
lahm86 committed Oct 16, 2024
1 parent d531d0b commit 79fcac2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions docs/tr2/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## [Unreleased](https://github.com/LostArtefacts/TRX/compare/tr2-0.5...develop) - ××××-××-××
- fixed `/give` not working with weapons (regression from 0.5)
- fixed the camera being cut off after using the gong hammer in Ice Palace (#1580)
- improved switch object names
- Switch Type 1 renamed to "Airlock Switch"
- Switch Type 2 renamed to "Small Switch"
Expand Down
1 change: 1 addition & 0 deletions docs/tr2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ decompilation process. We recognize that there is much work to be done.
#### Visuals

- fixed TGA screenshots crashing the game
- fixed the camera being cut off after using the gong hammer in Ice Palace

#### Audio

Expand Down
4 changes: 3 additions & 1 deletion src/tr2/game/lara/state.c
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,9 @@ void __cdecl Lara_State_Extra_Breath(ITEM *item, COLL_INFO *coll)
item->current_anim_state = LS_STOP;
g_Lara.extra_anim = 0;
g_Lara.gun_status = LGS_ARMLESS;
g_Camera.type = CAM_CHASE;
if (g_Camera.type != CAM_HEAVY) {
g_Camera.type = CAM_CHASE;
}
Output_AlterFOV(GAME_FOV * PHD_DEGREE);
}

Expand Down

0 comments on commit 79fcac2

Please sign in to comment.