]> git.localhorst.tv Git - l2e.git/blobdiff - src/battle/states/PerformAttacks.h
removed now superfluous Application parameter to State callbacks
[l2e.git] / src / battle / states / PerformAttacks.h
index fa16b4c37a7a1e1a1427c4eec35ed8fa2388e3f5..06ce1b89cd93329719988b561b272fcf1c6982e9 100644 (file)
@@ -24,20 +24,21 @@ class PerformAttacks
 
 public:
        explicit PerformAttacks(BattleState *battle)
-       : ctrl(0), battle(battle), moveAnimation(0), targetAnimation(0), titleBarText(0), cursor(-1) { }
+       : battle(battle), moveAnimation(0), targetAnimation(0), titleBarText(0), cursor(-1) { }
 
 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 CheckAnimations();
        bool HasAnimationsRunning() const;
@@ -51,7 +52,6 @@ private:
        void RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        graphics::AnimationRunner moveAnimation;
        graphics::AnimationRunner targetAnimation;