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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 484e452..074578e 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -18,6 +18,7 @@
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
+#include "../graphics/Menu.h"
 
 #include <vector>
 #include <SDL.h>
@@ -77,6 +78,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</* Item */ void *> &GetItemMenu() { return itemMenu; }
+		const graphics::Menu</* Item */ void *> &GetItemMenu() const { return itemMenu; }
 
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -103,6 +110,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</* Item */ void *> itemMenu;
+	std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
 	std::vector<HeroTag> heroTags;
 	std::vector<AttackChoice> attackChoices;
 	int activeHero;