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

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index 61c5270..cdf7881 100644
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -8,38 +8,37 @@
 #ifndef BATTLE_RUNSTATE_H_
 #define BATTLE_RUNSTATE_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
-class BattleState;
-
 class RunState
 : public app::State {
 
 public:
 	explicit RunState(BattleState *battle)
-	: ctrl(0), battle(battle){ }
+	: battle(battle){ }
 
 public:
-	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void PauseState(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;