Skip to content

Commit

Permalink
boat/skidoo: fix Lara getting stuck in her hit animation
Browse files Browse the repository at this point in the history
Resolves #1606.
  • Loading branch information
walkawayy authored and rr- committed Nov 11, 2024
1 parent df8eacc commit ff9502a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/tr1/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
- fixed game stuck at remapping controller key if no controllers connected (#1788)
- fixed being able to shoot the scion multiple times if save/load is used while it blows up (#1819)
- fixed certain erroneous `/play` invocations resulting in duplicated error messages
- fixed Lara getting stuck in her hit animation if she is hit while mounting the boat or skidoo (#1606)
- improved enemy item drops by supporting the TR2+ approach of having drops defined in level data (#1713)
- improved Italian localization for the Config Tool
- improved the injection approach for Lara's responsive jumping (#1823)
Expand Down
1 change: 1 addition & 0 deletions docs/tr2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ decompilation process. We recognize that there is much work to be done.
- fixed harpoon bolts damaging inactive enemies
- fixed the distorted skybox in room 5 of Barkhang Monastery
- fixed new saves not displaying the save count in the passport
- fixed Lara getting stuck in her hit animation if she is hit while mounting the boat or skidoo

#### Cheats
- added a fly cheat
Expand Down
1 change: 1 addition & 0 deletions src/tr2/decomp/skidoo.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ void __cdecl Skidoo_Collision(
lara_item->current_anim_state = LARA_STATE_SKIDOO_GET_ON;
lara_item->frame_num = g_Anims[lara_item->anim_num].frame_base;
g_Lara.gun_status = LGS_ARMLESS;
g_Lara.hit_direction = -1;

ITEM *const item = &g_Items[item_num];
lara_item->pos.x = item->pos.x;
Expand Down
1 change: 1 addition & 0 deletions src/tr2/game/objects/vehicles/boat.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ void __cdecl Boat_Collision(
}

g_Lara.water_status = LWS_ABOVE_WATER;
g_Lara.hit_direction = -1;

ITEM *const boat = &g_Items[item_num];

Expand Down

0 comments on commit ff9502a

Please sign in to comment.