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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index ff0672d..57c037f 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -82,6 +82,7 @@ public:
 	const Hero &ActiveHero() const { return heroes[activeHero]; }
 	Hero &HeroAt(std::vector<Hero>::size_type index) { return heroes[index]; }
 	const Hero &HeroAt(std::vector<Hero>::size_type index) const { return heroes[index]; }
+	void SwapHeroes(std::vector<Hero>::size_type lhs, std::vector<Hero>::size_type rhs);
 	const HeroTag &ActiveHeroTag() const { return heroTags[activeHero]; }
 	const HeroTag &HeroTagAt(std::vector<Hero>::size_type index) const { return heroTags[index]; }
 	const geometry::Point<int> &HeroTagPositionAt(std::vector<Hero>::size_type index) const { return heroTagPositions[index]; }
@@ -89,14 +90,15 @@ public:
 	void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); }
 	AttackChoice &ActiveHeroAttackChoice() { return attackChoices[activeHero]; }
 	const AttackChoice &ActiveHeroAttackChoice() const { return attackChoices[activeHero]; }
+	const AttackChoice &AttackChoiceAt(std::vector<Hero>::size_type index) const { return attackChoices[index]; }
 	TargetSelection &ActiveHeroTargets() { return attackChoices[activeHero].Selection(); }
 	const TargetSelection &ActiveHeroTargets() const { return attackChoices[activeHero].Selection(); }
 	bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); }
 
 	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; }
 
@@ -123,6 +125,7 @@ public:
 
 private:
 	void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
+	void LoadIkariMenu(std::vector<Hero>::size_type heroIndex);
 	void LoadInventory();
 
 private:
@@ -139,7 +142,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];