X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=bf2d2c1ff1c6d084cef55c91fdc6b7b038a588ad;hb=e3a38cbb756b2f0b77afcf91bf2a397bb1677bce;hp=5547bbf8235822c64bf6d6ca6ecb49ba98df9af4;hpb=9a273798937710928304fdcc5e33a78c6f8b48be;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 5547bbf..bf2d2c1 100644
--- 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));
 			}
 		}
 	}