X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=96a7ce20643d5b62f4aee3d3c9f0f68103280a3a;hb=7946f704a4cd3a985d2fb523079fce7fa14c341e;hp=484e4529c6a49d7d78776b3de9420f286a96bcdf;hpb=b6502719f0f02bdb4fc39aa66fa4a369ea583036;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 484e452..96a7ce2 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -18,11 +18,16 @@
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
+#include "../graphics/Menu.h"
 
 #include <vector>
 #include <SDL.h>
 
 namespace app { class Input; }
+namespace common {
+	class Inventory;
+	class Item;
+}
 namespace graphics {
 	class Font;
 	class Frame;
@@ -77,6 +82,12 @@ 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(); }
+	graphics::Menu</* Spell */ void *> &GetSpellMenu() { return spellMenus[activeHero]; }
+	const graphics::Menu</* Spell */ void *> &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 *> &GetItemMenu() { return itemMenu; }
+	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -92,6 +103,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;
@@ -103,6 +117,9 @@ private:
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
+	std::vector<graphics::Menu</* Spell */ void *> > spellMenus;
+	graphics::Menu<const common::Item *> itemMenu;
+	std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
 	std::vector<HeroTag> heroTags;
 	std::vector<AttackChoice> attackChoices;
 	int activeHero;