From a45cae167c7a0608684225a7e413bf72cc6db353 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Fri, 10 Aug 2012 15:54:10 +0200
Subject: [PATCH] set ikari menu to point to items

---
 src/battle/BattleState.cpp | 1 -
 src/battle/BattleState.h   | 6 +++---
 src/battle/Resources.h     | 2 +-
 src/main.cpp               | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index c54feca..da3dad6 100644
--- 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 ff0672d..ff5b624 100644
--- 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 bd2fd91..5e56eb3 100644
--- 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 3007436..192a5de 100644
--- 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);
-- 
2.39.2