Skip to content

Commit

Permalink
bat: reset fallspeed on death
Browse files Browse the repository at this point in the history
This prevents conflicts in setting the bats' Y position during the
death animation, which itself manages Y shift during the bounce.

Resolves LostArtefacts#992.
  • Loading branch information
lahm86 committed Apr 8, 2024
1 parent 2510d83 commit 7e3f17d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- fixed the remember played music option always being enabled (#1249, regression since 2.16)
- fixed the underwater SFX playing for one frame at the start of Palace Midas (#1251)
- fixed an incorrect frame in Lara's underwater twist animation (OG bug in TR2 onwards) (#1242)
- fixed flickering in bats' death animations and rapid shooting if Lara continues to fire when they are killed (#992)

## [3.1.1](https://github.com/LostArtefacts/TR1X/compare/3.1...3.1.1) - 2024-01-19
- changed quick load to show empty passport instead of opening the save game menu when there are no saves (#1141)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ Not all options are turned on by default. Refer to `TR1X_ConfigTool.exe` for det
- fixed various bugs with falling movable blocks
- fixed bugs when trying to stack multiple movable blocks
- fixed Midas's touch having unrestricted vertical range
- fixed flickering in bats' death animations and rapid shooting if Lara continues to fire when they are killed

#### Cheats
- added a fly cheat
Expand Down
1 change: 1 addition & 0 deletions src/game/objects/creatures/bat.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ void Bat_Control(int16_t item_num)
item->speed = 0;
} else {
item->gravity_status = 0;
item->fall_speed = 0;
item->goal_anim_state = BAT_DEATH;
item->pos.y = item->floor;
}
Expand Down

0 comments on commit 7e3f17d

Please sign in to comment.