1
0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-05 20:57:46 +02:00

fix load & save mutants health, fix giant mutant grab

This commit is contained in:
XProger
2021-02-21 22:02:42 +03:00
parent b68ce6d4ef
commit 5690d64901

View File

@@ -1910,7 +1910,7 @@ struct Mutant : Enemy {
} }
virtual void setSaveData(const SaveEntity &data) { virtual void setSaveData(const SaveEntity &data) {
Character::setSaveData(data); Enemy::setSaveData(data);
if (flags.invisible) if (flags.invisible)
deactivate(true); deactivate(true);
} }
@@ -2139,7 +2139,7 @@ struct GiantMutant : Enemy {
} }
virtual void setSaveData(const SaveEntity &data) { virtual void setSaveData(const SaveEntity &data) {
Character::setSaveData(data); Enemy::setSaveData(data);
if (flags.invisible) if (flags.invisible)
deactivate(true); deactivate(true);
} }
@@ -2226,7 +2226,7 @@ struct GiantMutant : Enemy {
} }
break; break;
case STATE_ATTACK_3 : case STATE_ATTACK_3 :
if (target->stand != STAND_HANG) { if ((mask & HIT_MASK_HAND) && (target->stand != STAND_HANG)) {
target->hit(GIANT_MUTANT_DAMAGE_FATAL, this, TR::HIT_GIANT_MUTANT); target->hit(GIANT_MUTANT_DAMAGE_FATAL, this, TR::HIT_GIANT_MUTANT);
return STATE_FATAL; return STATE_FATAL;
} }
@@ -2306,7 +2306,7 @@ struct Centaur : Enemy {
} }
virtual void setSaveData(const SaveEntity &data) { virtual void setSaveData(const SaveEntity &data) {
Character::setSaveData(data); Enemy::setSaveData(data);
if (flags.invisible) if (flags.invisible)
deactivate(true); deactivate(true);
} }