X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.h;h=060a8124d693abac6677d21a7e4d106d11f470ec;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=136436f6c680b251cbe8e743ef7d6a4c8a1a2ff5;hpb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;p=l2e.git

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index 136436f..060a812 100644
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -8,9 +8,16 @@
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_H_
 
-#include "../fwd.h"
+namespace battle {
+	class BattleState;
+	class SelectAttackType;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
 
 namespace battle {
 
@@ -24,21 +31,21 @@ 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 RenderFrame(SDL_Surface *, const geometry::Vector<int> &offset);
-	void RenderHeadline(SDL_Surface *, const geometry::Vector<int> &offset);
-	void RenderMenu(SDL_Surface *, const geometry::Vector<int> &offset);
+	void RenderFrame(SDL_Surface *, const math::Vector<int> &offset);
+	void RenderHeadline(SDL_Surface *, const math::Vector<int> &offset);
+	void RenderMenu(SDL_Surface *, const math::Vector<int> &offset);
 
 private:
 	BattleState *battle;