X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=bf2d2c1ff1c6d084cef55c91fdc6b7b038a588ad;hb=fa2eb577b1b5356b8f4b1c23b52f673900ae6b71;hp=bd039ff588c7e86bb278065dad1a49bd092a1c5d;hpb=8639675fbf1d232ab8188dd283149ab650e10336;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index bd039ff..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) {