Merge branch 'master' into menus

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

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index 2a55a92f7f3e512a4e066e57d23b95423098c3d9..a48633d6dc7434b8ea754cf51c60eae5463d7d7b 100644 (file)
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -19,25 +19,25 @@ class SelectMoveAction
 
 public:
        explicit SelectMoveAction(BattleState *battle)
-       : ctrl(0), battle(battle) { }
+       : battle(battle) { }
 
 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 OnResize(int width, int height);
-
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
+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:
        void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
 
 };