added second column in ikari menu

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index ff0672da84a2f365b8379455437c109e72779c41..93e1e2b032c82a666dcb5cd1bed79c997530d243 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -95,8 +95,8 @@ public:
 
        graphics::Menu<const common::Spell *> &GetSpellMenu() { return spellMenus[activeHero]; }
        const graphics::Menu<const common::Spell *> &GetSpellMenu() const { return spellMenus[activeHero]; }
-       graphics::Menu</* Ikari or Item */ void *> &GetIkariMenu() { return ikariMenus[activeHero]; }
-       const graphics::Menu</* Ikari or Item */ void *> &GetIkariMenu() const { return ikariMenus[activeHero]; }
+       graphics::Menu<const common::Item *> &GetIkariMenu() { return ikariMenus[activeHero]; }
+       const graphics::Menu<const common::Item *> &GetIkariMenu() const { return ikariMenus[activeHero]; }
        graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
        const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
@@ -123,6 +123,7 @@ public:
 
 private:
        void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
+       void LoadIkariMenu(std::vector<Hero>::size_type heroIndex);
        void LoadInventory();
 
 private:
@@ -139,7 +140,7 @@ private:
        std::vector<Hero> heroes;
        std::vector<graphics::Menu<const common::Spell *> > spellMenus;
        graphics::Menu<const common::Item *> itemMenu;
-       std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
+       std::vector<graphics::Menu<const common::Item *> > ikariMenus;
        HeroTag heroTags[4];
        geometry::Point<int> heroTagPositions[4];
        AttackChoice attackChoices[4];