X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.h;h=cdf7881c9d48d9be2235173625bfde731ae92db6;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=b1c18cb7bca65382ac3c11f95fc5c211e552c381;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index b1c18cb..cdf7881 100644
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -10,7 +10,7 @@
 
 #include "../fwd.h"
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,25 +19,26 @@ class RunState
 
 public:
 	explicit RunState(BattleState *battle)
-	: ctrl(0), battle(battle){ }
+	: battle(battle){ }
 
 public:
-	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 Resize(int width, int height);
 
 	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
 private:
-	void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	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 RenderTitleBar(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
 	app::Timer<Uint32> timer;