X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=77e2b5dbdfa214db81bcd6a8f1313b18e05ce49f;hb=f615f4edc547d1ca74275382cc7a9cdd8cf30ba6;hp=a901c63f68ccf028063fec9ebc8a21d3313376be;hpb=04b582180c8f86f50f08f5141a2514a1fcda3e01;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index a901c63..77e2b5d 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -20,6 +20,7 @@
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Menu.h"
+#include "../graphics/SimpleAnimation.h"
 
 #include <vector>
 #include <SDL.h>
@@ -84,8 +85,7 @@ public:
 	graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
 	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
-	bool HasMoreHeroes() const { return activeHero < numHeroes; }
-	void NextHero() { ++activeHero; }
+	void NextHero();
 	bool BeforeFirstHero() const { return activeHero < 0; }
 	void PreviousHero() { --activeHero; }
 	void SwapHeroes(int lhs, int rhs);
@@ -97,6 +97,9 @@ public:
 	Monster &MonsterAt(int index) { return monsters[index]; }
 	const Monster &MonsterAt(int index) const { return monsters[index]; }
 
+	graphics::SimpleAnimation &HeroAnimationAt(int index) { return heroAnimations[index]; }
+	const graphics::SimpleAnimation &HeroAnimationAt(int index) const { return heroAnimations[index]; }
+
 	const HeroTag &HeroTagAt(int index) const { return heroTags[index]; }
 	const geometry::Point<int> &HeroTagPositionAt(int index) const { return heroTagPositions[index]; }
 
@@ -150,6 +153,7 @@ private:
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	Hero heroes[4];
+	graphics::SimpleAnimation heroAnimations[4];
 	graphics::Menu<const common::Spell *> spellMenus[4];
 	graphics::Menu<const common::Item *> itemMenu;
 	graphics::Menu<const common::Item *> ikariMenus[4];