store an application handle in each state

[l2e.git] / src / battle / states / RunState.h

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index e2d1b1b31f124cf9f55f0bf57a5faad41520500a..9cee764776e59df9062658db3c415f19b1b969a1 100644 (file)
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -19,9 +19,15 @@ class RunState
 
 public:
        explicit RunState(BattleState *battle)
-       : ctrl(0), battle(battle){ }
+       : battle(battle){ }
 
 public:
+
+       virtual void HandleEvents(const app::Input &);
+       virtual void UpdateWorld(float deltaT);
+       virtual void Render(SDL_Surface *);
+
+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);
@@ -29,15 +35,10 @@ public:
 
        virtual void OnResize(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);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        app::Timer<Uint32> timer;