Skip to content

Commit

Permalink
bacon_lara: prevent movement after death
Browse files Browse the repository at this point in the history
Resolves #875.
  • Loading branch information
lahm86 authored Jun 7, 2023
1 parent 37b8a1b commit 56e47d9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- added the ability to define the anchor room for Bacon Lara in the gameflow (#868)
- changed screen resolution option to apply immediately (#114)
- changed shaders to use GLSL 1.20 which should fix most issues with OpenGL 2.1 (#327, #685)
- changed Bacon Lara to prevent movement after her death (#875)
- fixed sounds stopping instead of pausing if game sounds in inventory are disabled (#717)
- fixed skipping Eidos logo and end credits (#541)
- fixed ceiling heights at times being miscalculated, resulting in camera issues and Lara being able to jump into the ceiling (#323)
Expand Down
6 changes: 6 additions & 0 deletions src/game/objects/creatures/bacon_lara.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "game/creature.h"
#include "game/items.h"
#include "game/lara/lara_draw.h"
#include "game/objects/common.h"
#include "game/room.h"
#include "global/const.h"
#include "global/vars.h"
Expand Down Expand Up @@ -126,6 +127,11 @@ void BaconLara_Control(int16_t item_num)

void BaconLara_Draw(ITEM_INFO *item)
{
if (item->current_anim_state == LS_DEATH) {
Object_DrawAnimatingItem(item);
return;
}

int16_t *old_mesh_ptrs[LM_NUMBER_OF];

for (int i = 0; i < LM_NUMBER_OF; i++) {
Expand Down

0 comments on commit 56e47d9

Please sign in to comment.