From 69123d71dacfdd6592c00ead8b92b6441d0f0228 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Fri, 10 Aug 2012 22:24:03 +0200
Subject: [PATCH] moved popping of battle state into battle state

---
 src/battle/BattleState.cpp     | 6 +++++-
 src/battle/BattleState.h       | 6 +++++-
 src/battle/states/RunState.cpp | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index b3ad20e..c294e1a 100644
--- 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) {
diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index e3ecca9..e94ed41 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -51,7 +51,8 @@ public:
 	, res(res)
 	, attackTypeMenu(res->attackIcons)
 	, moveMenu(res->moveIcons)
-	, activeHero(-1) { }
+	, activeHero(-1)
+	, ranAway(false) { }
 
 public:
 	void AddMonster(const Monster &);
@@ -109,6 +110,8 @@ public:
 	std::vector<Hero> &Heroes() { return heroes; }
 	const std::vector<Hero> &Heroes() const { return heroes; }
 
+	void SetRunaway() { ranAway = true; }
+
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
 		return geometry::Vector<int>(
@@ -147,6 +150,7 @@ private:
 	geometry::Point<int> heroTagPositions[4];
 	AttackChoice attackChoices[4];
 	int activeHero;
+	bool ranAway;
 
 };
 
diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp
index 7fdc066..6f4325a 100644
--- a/src/battle/states/RunState.cpp
+++ b/src/battle/states/RunState.cpp
@@ -49,8 +49,8 @@ void RunState::Resize(int width, int height) {
 
 void RunState::HandleEvents(const Input &input) {
 	if (timer.Finished()) {
+		battle->SetRunaway();
 		ctrl->PopState(); // pop self
-		ctrl->PopState(); // pop battle
 	}
 }
 
-- 
2.39.2