moved attack type into its own class

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index a3c0879cedbbace7352a0ad547a090e9be8e41ae..73f3fbc01813c478870d6cb42ff7988b87872c9b 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -38,8 +38,7 @@ public:
        , heroesLayout(&heroesLayout)
        , attackTypeMenu(attackIcons)
        , moveMenu(moveIcons)
-       , moveChoice(-1)
-       , activeHero(0) { }
+       , activeHero(-1) { }
 
 public:
        void AddMonster(const Monster &);
@@ -59,6 +58,9 @@ public:
        AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
        MoveMenu &GetMoveMenu() { return moveMenu; }
 
+       bool HasMoreHeroes() const { return activeHero < (int) heroes.size(); }
+       void NextHero() { ++activeHero; }
+
 public:
        geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
                return geometry::Vector<int>(
@@ -85,7 +87,6 @@ private:
        std::vector<Monster> monsters;
        std::vector<Hero> heroes;
        std::vector<HeroTag> heroTags;
-       int moveChoice;
        int activeHero;
 
 };