renamed state callbacks

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

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index e8a878d761e6b214820ba998407c7d98087dc617..44ea74bf9eb97e9aad025995c318dfb0666e0d1c 100644 (file)
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -13,7 +13,7 @@
 #include "../BattleState.h"
 #include "../NumberAnimation.h"
 #include "../../geometry/Vector.h"
-#include "../../graphics/ComplexAnimation.h"
+#include "../../graphics/Animation.h"
 
 #include <vector>
 
@@ -27,10 +27,10 @@ public:
        : ctrl(0), battle(battle), moveAnimation(0), targetAnimation(0), titleBarText(0), cursor(-1) { }
 
 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 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 Resize(int width, int height);
 
@@ -44,6 +44,8 @@ private:
        void ResetAnimation();
 
 private:
+       void AddNumberAnimations(const TargetSelection &);
+
        void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
        void RenderNumbers(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
        void RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
@@ -51,13 +53,13 @@ private:
 private:
        app::Application *ctrl;
        BattleState *battle;
-       graphics::Animation *moveAnimation;
-       graphics::Animation *targetAnimation;
+       graphics::AnimationRunner moveAnimation;
+       graphics::AnimationRunner targetAnimation;
        const char *titleBarText;
        app::Timer<Uint32> titleBarTimer;
        app::Timer<Uint32> targetAnimationTimer;
        std::vector<NumberAnimation> numberAnimation;
-       std::vector<geometry::Point<int> > numberPosition;
+       std::vector<geometry::Vector<int> > numberPosition;
        int cursor;
 
 };