removed now superfluous Application parameter to State callbacks

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 952bcee393d242cca8d73cdf793c23f5afba062e..1b53d776b0c457ace6b3b730b8fea5f959ae33d5 100644 (file)
--- 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(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 +82,6 @@ private:
 
 private:
        common::GameConfig *game;
-       app::Application *ctrl;
        Map *map;
        Entity *controlled;
        Entity *pushed;