diff options
| -rw-r--r-- | engines/xeen/combat.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 30ea94ee88..3a248e5942 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -324,7 +324,7 @@ void Combat::doCharDamage(Character &c, int charNum, int monsterDataIndex) { intf._charPowSprites.draw(0, frame, Common::Point(Res.CHAR_FACES_X[charNum], 150)); windows[33].update(); - damage -= party._powerShield; + damage = MAX(damage - party._powerShield, 0); if (damage > 0 && monsterData._specialAttack && !c.charSavingThrow(DT_PHYSICAL)) { switch (monsterData._specialAttack) { case SA_POISON: @@ -427,15 +427,15 @@ void Combat::doCharDamage(Character &c, int charNum, int monsterDataIndex) { default: break; } - - if (debugger._invincible) - // Invincibility mode is on, so reset conditions that were set - c.clearConditions(); - else - // Standard gameplay, deal out the damage - c.subtractHitPoints(damage); } + if (debugger._invincible) + // Invincibility mode is on, so reset conditions that were set + c.clearConditions(); + else + // Standard gameplay, deal out the damage + c.subtractHitPoints(damage); + events.ipause(2); intf.drawParty(true); } |