X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=e3ecca915cfaa967ad4b9c765edd313c696d267c;hb=6d080d21d8055df9962296863b4c0954bc81410b;hp=ff5b624dc69ab4176f176b2bd05d72869ad11806;hpb=a45cae167c7a0608684225a7e413bf72cc6db353;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index ff5b624..e3ecca9 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -65,7 +65,7 @@ public:
 
 	virtual void Resize(int width, int height);
 
-	virtual void HandleInput(const app::Input &);
+	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
@@ -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,6 +90,7 @@ 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(); }
@@ -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: