diff options
Diffstat (limited to 'engines/xeen/combat.cpp')
| -rw-r--r-- | engines/xeen/combat.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 1d03a5128d..13efe912de 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -422,6 +422,9 @@ void Combat::doCharDamage(Character &c, int charNum, int monsterDataIndex) { if (c._currentHp > 0) c._currentHp = 0; break; + + default: + break; } c.subtractHitPoints(damage); @@ -823,7 +826,7 @@ void Combat::doMonsterTurn(int monsterId) { if (cond >= PARALYZED && cond <= ERADICATED) continue; - bool isHated = false; + isHated = false; switch (monsterData._hatesClass) { case CLASS_KNIGHT: case CLASS_PALADIN: @@ -1277,10 +1280,10 @@ void Combat::attack(Character &c, RangeType rangeType) { damage = 0; for (uint charIndex = 0; charIndex < party._activeParty.size(); ++charIndex) { - Character &c = party._activeParty[charIndex]; + Character &ch = party._activeParty[charIndex]; if (_shooting[charIndex] && !_missedShot[charIndex]) { - if (!hitMonster(c, rangeType)) { + if (!hitMonster(ch, rangeType)) { ++_missedShot[charIndex]; } else { damage = _monsterDamage ? _monsterDamage : _weaponDamage; @@ -1337,6 +1340,8 @@ void Combat::attack(Character &c, RangeType rangeType) { case CLASS_SORCERER: divisor = 8; break; + default: + break; } int numberOfAttacks = c.getCurrentLevel() / divisor + 1; @@ -1651,6 +1656,8 @@ bool Combat::hitMonster(Character &c, RangeType rangeType) { case CLASS_SORCERER: divisor = 4; break; + default: + break; } chance += c.getCurrentLevel() / divisor; |