moved popping of battle state into battle state

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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index b3ad20ede3ef4a15aec0ffb214aeccc8a74dfbba..c294e1a28feda13da5b9f81be3b9e15aa4aecdc3 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -187,7 +187,11 @@ void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
 }
 
 void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
-       // TODO: check for victory, defeat or run
+       // TODO: check for victory or defeat
+       if (ranAway) {
+               ctrl.PopState(); // quit the battle scene
+               return;
+       }
        // reset attack choices
        activeHero = -1;
        for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {