set ikari menu to point to items

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index c54fecaca88dd10acdb79ff16b597fe82a6d7cf5..da3dad6de234f43263860d1e5b3dfdb85e16ea95 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -71,7 +71,6 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
        heroTagPositions[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight);
        heroTagPositions[3] = Point<int>(xOffset + tagWidth, BackgroundHeight() - tagHeight);
 
-       // TODO: insert item menu entries
        itemMenu = res->itemMenuPrototype;
        LoadInventory();
 }

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index ff0672da84a2f365b8379455437c109e72779c41..ff5b624dc69ab4176f176b2bd05d72869ad11806 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; }
 
@@ -139,7 +139,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];

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index bd2fd91358839249062177d71d405ee30e316ab0..5e56eb322296445b1c8ddfc17f567d9ea81627a2 100644 (file)
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -58,7 +58,7 @@ struct Resources {
        graphics::Menu<const common::Item *> itemMenuPrototype;
 
        const char *ikariMenuHeadline;
-       graphics::Menu</* Ikari or Item */ void *> ikariMenuPrototype;
+       graphics::Menu<const common::Item *> ikariMenuPrototype;
 
 
        Resources()

diff --git a/src/main.cpp b/src/main.cpp
index 30074366d9c8dbb2fbda12479cd4390859b870b3..192a5de279cca505faba6583134f30bcc5d1c9d7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -405,7 +405,7 @@ int main(int argc, char **argv) {
                dekar.SetJewel(&krakenRock);
 
                battleRes.ikariMenuHeadline = "Please choose equipment.";
-               battleRes.ikariMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);
+               battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);
                battleRes.ikariMenuPrototype.Add("Zirco whip   Thundershriek", 0, false, &swordIcon);
                battleRes.ikariMenuPrototype.Add("Zircon plate Sudden cure", 0, true, &armorIcon);
                battleRes.ikariMenuPrototype.Add("Zirco gloves Forcefield", 0, true, &shieldIcon);