]> git.localhorst.tv Git - l2e.git/blobdiff - src/battle/BattleState.h
added item select state
[l2e.git] / src / battle / BattleState.h
index 365f1983305fcb3de5139b295cb89947c6db2dd0..65e8727906859fd442c174107ce92782d603fb1d 100644 (file)
@@ -78,7 +78,10 @@ public:
        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(); }
-       const graphics::Menu</* Spell */ void *> GetSpellMenu() const { return spellMenus[activeHero]; }
+       graphics::Menu</* Spell */ void *> &GetSpellMenu() { return spellMenus[activeHero]; }
+       const graphics::Menu</* Spell */ void *> &GetSpellMenu() const { return spellMenus[activeHero]; }
+       graphics::Menu</* Item */ void *> &GetItemMenu() { return itemMenu; }
+               const graphics::Menu</* Item */ void *> &GetItemMenu() const { return itemMenu; }
 
 public:
        geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -106,6 +109,7 @@ private:
        std::vector<Monster> monsters;
        std::vector<Hero> heroes;
        std::vector<graphics::Menu</* Spell */ void *> > spellMenus;
+       graphics::Menu</* Item */ void *> itemMenu;
        std::vector<HeroTag> heroTags;
        std::vector<AttackChoice> attackChoices;
        int activeHero;