X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;fp=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=e0d3df821a0a66f944884048eef1f6c2fbd0d43c;hb=85ac93ffe31bfeee54aa6167111f1c15f14bc405;hp=f6157e1bc9d298468f3cfd73ed3950d74c16591e;hpb=e3b4534dd0a7624b4e460237a2ec22c44cb29ea9;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index f6157e1..e0d3df8 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -10,18 +10,21 @@
 
 #include "../../app/State.h"
 
+#include "../BattleState.h"
 #include "../../geometry/Vector.h"
 
-namespace battle {
+#include <vector>
+
+namespace graphics { class Animation; }
 
-class BattleState;
+namespace battle {
 
 class PerformAttacks
 : public app::State {
 
 public:
 	explicit PerformAttacks(BattleState *battle)
-	: ctrl(0), battle(battle), titleBarText(0), cursor(0), monsters(false) { }
+	: ctrl(0), battle(battle), moveAnimation(0), titleBarText(0), cursor(-1) { }
 
 public:
 	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
@@ -41,10 +44,11 @@ private:
 private:
 	app::Application *ctrl;
 	BattleState *battle;
+	graphics::Animation *moveAnimation;
 	const char *titleBarText;
-	app::Timer<Uint32> fakeMoveTimer;
+	app::Timer<Uint32> titleBarTimer;
+	std::vector<BattleState::Order> order;
 	int cursor;
-	bool monsters;
 
 };