X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=4b0ffcff43c591f41f754b62e3f983208ef1479c;hb=57a9949304b1d938bdb795213a8f46a7e28fcf7c;hp=65e8727906859fd442c174107ce92782d603fb1d;hpb=57675025108b7ad3989737f18ebfeec8e5e44889;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 65e8727..4b0ffcf 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -21,9 +21,14 @@
 #include "../graphics/Menu.h"
 
 #include <vector>
+#include <string>
 #include <SDL.h>
 
 namespace app { class Input; }
+namespace common {
+	class Inventory;
+	class Item;
+}
 namespace graphics {
 	class Font;
 	class Frame;
@@ -80,8 +85,10 @@ public:
 	bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); }
 	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; }
+	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 *> &GetItemMenu() { return itemMenu; }
+	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -97,6 +104,9 @@ public:
 	void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
+private:
+	void LoadInventory();
+
 private:
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
@@ -109,7 +119,9 @@ private:
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
 	std::vector<graphics::Menu</* Spell */ void *> > spellMenus;
-	graphics::Menu</* Item */ void *> itemMenu;
+	graphics::Menu<const common::Item *> itemMenu;
+	std::vector<std::string> itemMenuStrings;
+	std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
 	std::vector<HeroTag> heroTags;
 	std::vector<AttackChoice> attackChoices;
 	int activeHero;