turned battle's menu vectors into arrays

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index e3ecca915cfaa967ad4b9c765edd313c696d267c..7dbd016d8717ff8415a1ed63aa8d0f717ffbd54d 100644 (file)
--- 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 &);
@@ -82,6 +83,8 @@ public:
        const Hero &ActiveHero() const { return heroes[activeHero]; }
        Hero &HeroAt(std::vector<Hero>::size_type index) { return heroes[index]; }
        const Hero &HeroAt(std::vector<Hero>::size_type index) const { return heroes[index]; }
+       Monster &MonsterAt(std::vector<Monster>::size_type index) { return monsters[index]; }
+       const Monster &MonsterAt(std::vector<Monster>::size_type index) const { return monsters[index]; }
        void SwapHeroes(std::vector<Hero>::size_type lhs, std::vector<Hero>::size_type rhs);
        const HeroTag &ActiveHeroTag() const { return heroTags[activeHero]; }
        const HeroTag &HeroTagAt(std::vector<Hero>::size_type index) const { return heroTags[index]; }
@@ -108,6 +111,11 @@ public:
        bool HeroPositionOccupied(int index) { return index >= 0 && index < int(heroes.size()); }
        std::vector<Hero> &Heroes() { return heroes; }
        const std::vector<Hero> &Heroes() const { return heroes; }
+       std::vector<Monster> &Monsters() { return monsters; }
+       const std::vector<Monster> &Monsters() const { return monsters; }
+
+       void SetRunaway() { ranAway = true; }
+       void ClearAllAttacks();
 
 public:
        geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -140,13 +148,14 @@ private:
        std::vector<geometry::Point<int> > heroesPositions;
        std::vector<Monster> monsters;
        std::vector<Hero> heroes;
-       std::vector<graphics::Menu<const common::Spell *> > spellMenus;
+       graphics::Menu<const common::Spell *> spellMenus[4];
        graphics::Menu<const common::Item *> itemMenu;
-       std::vector<graphics::Menu<const common::Item *> > ikariMenus;
+       graphics::Menu<const common::Item *> ikariMenus[4];
        HeroTag heroTags[4];
        geometry::Point<int> heroTagPositions[4];
        AttackChoice attackChoices[4];
        int activeHero;
+       bool ranAway;
 
 };