removed now superfluous Application parameter to State callbacks

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

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index 68e736001db6d85ae6719306ab1b5a7c35c6ff87..198e4d3d1504d0a99aa78471ee7d51b2123bb3c7 100644 (file)
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -19,20 +19,21 @@ class SwapHeroes
 
 public:
        SwapHeroes(BattleState *battle, SelectMoveAction *parent)
-       : ctrl(0), battle(battle), parent(parent), cursor(0), selected(-1), flipFlop(true) { }
+       : battle(battle), parent(parent), cursor(0), selected(-1), flipFlop(true) { }
 
 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 MoveUp();
        void MoveRight();
@@ -43,7 +44,6 @@ private:
        void RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        SelectMoveAction *parent;
        int cursor;