reworked Application's state stack

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index a3c0879cedbbace7352a0ad547a090e9be8e41ae..12c55f71856d1536cc12e432ec7cca0777f72b03 100644 (file)
--- 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"
@@ -38,8 +39,7 @@ public:
        , heroesLayout(&heroesLayout)
        , attackTypeMenu(attackIcons)
        , moveMenu(moveIcons)
-       , moveChoice(-1)
-       , activeHero(0) { }
+       , activeHero(-1) { }
 
 public:
        void AddMonster(const Monster &);
@@ -47,7 +47,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 +61,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 +80,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 +92,7 @@ private:
        std::vector<Monster> monsters;
        std::vector<Hero> heroes;
        std::vector<HeroTag> heroTags;
-       int moveChoice;
+       std::vector<AttackChoice> attackChoices;
        int activeHero;
 
 };