X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=inline;f=src%2Fmap%2FMapState.h;h=9cff10cbfa5cbd248b7188d7bd3bfb762342ae92;hb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;hp=952bcee393d242cca8d73cdf793c23f5afba062e;hpb=2ad47aa3758fe5d04ba1764f275a0fe30706d200;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 952bcee..9cff10c 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -30,12 +30,6 @@ public:
 	virtual ~MapState() { }
 
 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 *);
@@ -50,6 +44,14 @@ public:
 
 	virtual void HandleSyscall(common::ScriptRunner &);
 
+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 OnResize(int width, int height);
+
 private:
 	static bool ZCompare(const Entity *lhs, const Entity *rhs);
 
@@ -80,7 +82,6 @@ private:
 
 private:
 	common::GameConfig *game;
-	app::Application *ctrl;
 	Map *map;
 	Entity *controlled;
 	Entity *pushed;