mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-02-24 15:32:30 +01:00
Code Issues Releases Wiki Activity

fix death in hang state

Browse Source
This commit is contained in:
XProger 2018-12-06 09:33:25 +03:00
parent a62d0df8db
commit 4505d64657
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lara.h
View File

@ -1575,7 +1575,7 @@ struct Lara : Character {
virtual void hit(float damage, Controller *enemy = NULL, TR::HitType hitType = TR::HIT_DEFAULT) { virtual void hit(float damage, Controller *enemy = NULL, TR::HitType hitType = TR::HIT_DEFAULT) {
if (dozy || level->isCutsceneLevel()) return; if (dozy || level->isCutsceneLevel()) return;
if (health <= 0.0f) return; if (health <= 0.0f && hitType != TR::HIT_FALL) return;
damageTime = LARA_DAMAGE_TIME; damageTime = LARA_DAMAGE_TIME;
@ -2820,7 +2820,13 @@ struct Lara : Character {
} }
virtual int getStateDeath() { virtual int getStateDeath() {
return (stand == STAND_UNDERWATER || stand == STAND_ONWATER) ? STATE_UNDERWATER_DEATH : (state == STATE_MIDAS_DEATH ? STATE_MIDAS_DEATH : STATE_DEATH); if (stand == STAND_UNDERWATER || stand == STAND_ONWATER)
return STATE_UNDERWATER_DEATH;
if (state == STATE_MIDAS_DEATH)
return STATE_MIDAS_DEATH;
if (state == STATE_HANG || state == STATE_HANG_LEFT || state == STATE_HANG_RIGHT || state == STATE_UP_JUMP)
return STATE_FALL;
return STATE_DEATH;
} }
virtual int getStateDefault() { virtual int getStateDefault() {