fixed flags in makefiles

[l2e.git] / src / map / MapState.h

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 35c6d6494ef6008a2638d67a27fe3f032c8de85d..136e1b0467eda947d968cb18ac0ea118d14057e5 100644 (file)
--- 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 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 *);
@@ -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;