check for victory or defeat when looking for the next attack

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 5547bbf8235822c64bf6d6ca6ecb49ba98df9af4..bf2d2c1ff1c6d084cef55c91fdc6b7b038a588ad 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -278,6 +278,10 @@ void BattleState::CalculateAttackOrder() {
 }
 
 void BattleState::NextAttack() {
+       if (Victory() || Defeat()) {
+               attackCursor = attackOrder.size();
+               return;
+       }
        ++attackCursor;
        while (attackCursor < int(attackOrder.size())) {
                if (attackOrder[attackCursor].isMonster) {
@@ -386,8 +390,9 @@ void BattleState::ApplyDamage() {
                }
        } else {
                for (int i(0); i < NumHeroes(); ++i) {
+                       Hero &hero(HeroAt(i));
                        if (ts.IsBad(i)) {
-                               HeroAt(i).SubtractHealth(ts.GetAmount(i));
+                               hero.SubtractHealth(ts.GetAmount(i));
                        }
                }
        }