X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=136e1b0467eda947d968cb18ac0ea118d14057e5;hb=dc2dcbbfa1298bed46a4190fbd337c7ef83cc8af;hp=952bcee393d242cca8d73cdf793c23f5afba062e;hpb=2ad47aa3758fe5d04ba1764f275a0fe30706d200;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 952bcee..136e1b0 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -21,6 +21,7 @@
 
 namespace map {
 
+/// Shows a map and its entities an optionally control a single entity.
 class MapState
 : public app::State
 , public common::ScriptHost {
@@ -30,12 +31,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 +45,14 @@ public:
 
 	virtual void HandleSyscall(common::ScriptRunner &);
 
+private:
+	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:
 	static bool ZCompare(const Entity *lhs, const Entity *rhs);
 
@@ -80,7 +83,6 @@ private:
 
 private:
 	common::GameConfig *game;
-	app::Application *ctrl;
 	Map *map;
 	Entity *controlled;
 	Entity *pushed;