X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectMoveAction.h;h=1eb7a48d8fb254da7b586d6ad64cbb272fa7eba7;hb=667e1d9c6a78d0b608b518a4e5b5c31bc30e4e89;hp=cd54aed1e0f38c22aa39ea66a2d9dfcb00bf0d86;hpb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;p=l2e.git

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index cd54aed..1eb7a48 100644
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -1,16 +1,15 @@
-/*
- * SelectMoveAction.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
-#include "../fwd.h"
+namespace battle {
+	class BattleState;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
 
 namespace battle {
 
@@ -23,19 +22,19 @@ public:
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 private:
-	virtual void OnEnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnEnterState(SDL_Surface *screen);
+	virtual void OnExitState(SDL_Surface *screen);
+	virtual void OnResumeState(SDL_Surface *screen);
+	virtual void OnPauseState(SDL_Surface *screen);
 
 	virtual void OnResize(int width, int height);
 
 private:
-	void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
 	BattleState *battle;
@@ -44,4 +43,4 @@ private:
 
 }
 
-#endif /* BATTLE_SELECTMOVEACTION_H_ */
+#endif