X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=42094d66bec33c70422b967dc30c535f7910acc8;hb=bfcf2f4de43077249b82af03a0e1b8281b8490e3;hp=a3c0879cedbbace7352a0ad547a090e9be8e41ae;hpb=558fd3d14ad1a9dc347998691a0b300fd334a16a;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index a3c0879..42094d6 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,6 +8,7 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+#include "AttackChoice.h"
 #include "AttackTypeMenu.h"
 #include "Hero.h"
 #include "HeroTag.h"
@@ -27,7 +28,6 @@ namespace battle {
 
 class PartyLayout;
 
-// TODO: maybe split battle state into substates for each menu?
 class BattleState
 : public app::State {
 
@@ -38,8 +38,7 @@ public:
 	, heroesLayout(&heroesLayout)
 	, attackTypeMenu(attackIcons)
 	, moveMenu(moveIcons)
-	, moveChoice(-1)
-	, activeHero(0) { }
+	, activeHero(-1) { }
 
 public:
 	void AddMonster(const Monster &);
@@ -47,7 +46,9 @@ public:
 
 public:
 	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState();
+	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
 
 	virtual void Resize(int width, int height);
 
@@ -59,6 +60,12 @@ public:
 	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
 	MoveMenu &GetMoveMenu() { return moveMenu; }
 
+	bool HasMoreHeroes() const { return activeHero < (int) heroes.size(); }
+	void NextHero() { ++activeHero; }
+	bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
+	void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); }
+	bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); }
+
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
 		return geometry::Vector<int>(
@@ -72,7 +79,6 @@ public:
 	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderAttackTypeMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
 	SDL_Surface *background;
@@ -85,7 +91,7 @@ private:
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
 	std::vector<HeroTag> heroTags;
-	int moveChoice;
+	std::vector<AttackChoice> attackChoices;
 	int activeHero;
 
 };