X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=ff0672da84a2f365b8379455437c109e72779c41;hb=d872d756e64b8f1f57cba64ae19f479f8eab3927;hp=3b293546382c1668a732eb80dff6eff64a26c500;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 3b29354..ff0672d 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -27,6 +27,7 @@ namespace app { class Input; }
 namespace common {
 	class Inventory;
 	class Item;
+	class Spell;
 }
 namespace graphics {
 	class Font;
@@ -86,12 +87,14 @@ public:
 	const geometry::Point<int> &HeroTagPositionAt(std::vector<Hero>::size_type index) const { return heroTagPositions[index]; }
 	bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
 	void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); }
+	AttackChoice &ActiveHeroAttackChoice() { return attackChoices[activeHero]; }
+	const AttackChoice &ActiveHeroAttackChoice() const { return attackChoices[activeHero]; }
 	TargetSelection &ActiveHeroTargets() { return attackChoices[activeHero].Selection(); }
 	const TargetSelection &ActiveHeroTargets() const { return attackChoices[activeHero].Selection(); }
 	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<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 *> &GetItemMenu() { return itemMenu; }
@@ -119,6 +122,7 @@ public:
 	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
+	void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
 	void LoadInventory();
 
 private:
@@ -133,7 +137,7 @@ private:
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
-	std::vector<graphics::Menu</* Spell */ void *> > spellMenus;
+	std::vector<graphics::Menu<const common::Spell *> > spellMenus;
 	graphics::Menu<const common::Item *> itemMenu;
 	std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
 	HeroTag heroTags[4];