From fa2eb577b1b5356b8f4b1c23b52f673900ae6b71 Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Mon, 20 Aug 2012 22:54:40 +0200 Subject: [PATCH] check for victory or defeat when looking for the next attack --- src/battle/BattleState.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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) { -- 2.39.2