X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=d0a002716268f1d9209988556e0e56f77a8c3ab1;hb=1162be37102b24df11f469495c0184f3f9a26ba0;hp=77e2b5dbdfa214db81bcd6a8f1313b18e05ce49f;hpb=b9fdb4fd361fbc0c8e2c0df9615e6eed540917a1;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 77e2b5d..d0a0027 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -19,8 +19,8 @@
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
+#include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
-#include "../graphics/SimpleAnimation.h"
 
 #include <vector>
 #include <SDL.h>
@@ -97,9 +97,6 @@ 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]; }
 
@@ -121,6 +118,15 @@ public:
 	void SetRunaway() { ranAway = true; }
 	void ClearAllAttacks();
 
+	struct Order {
+		Order(int index, bool isMonster)
+		: index(index), isMonster(isMonster) { }
+		int index;
+		bool isMonster;
+	};
+
+	void WriteOrder(std::vector<Order> &);
+
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
 		return geometry::Vector<int>(
@@ -153,7 +159,6 @@ 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];