added Maxim's melee animation

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

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index f6157e1bc9d298468f3cfd73ed3950d74c16591e..a4d58dcc64f47ada4dd39f3a6bd0c53c67108cf0 100644 (file)
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -10,18 +10,23 @@
 
 #include "../../app/State.h"
 
+#include "../BattleState.h"
+#include "../NumberAnimation.h"
 #include "../../geometry/Vector.h"
+#include "../../graphics/ComplexAnimation.h"
+
+#include <vector>
 
 namespace battle {
 
-class BattleState;
+class AttackAnimation;
 
 class PerformAttacks
 : public app::State {
 
 public:
        explicit PerformAttacks(BattleState *battle)
-       : ctrl(0), battle(battle), titleBarText(0), cursor(0), monsters(false) { }
+       : ctrl(0), battle(battle), moveAnimation(0), attackAnimation(0), titleBarText(0), cursor(-1) { }
 
 public:
        virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
@@ -35,16 +40,28 @@ public:
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
+private:
+       void CheckNumberAnimation();
+       bool HasAnimationsRunning() const;
+       void ResetAnimation();
+       void AdvanceCursor();
+       bool Finished() const { return cursor >= int(order.size()); }
+
 private:
        void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderNumbers(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
        app::Application *ctrl;
        BattleState *battle;
+       graphics::Animation *moveAnimation;
+       AttackAnimation *attackAnimation;
        const char *titleBarText;
-       app::Timer<Uint32> fakeMoveTimer;
+       app::Timer<Uint32> titleBarTimer;
+       std::vector<BattleState::Order> order;
+       std::vector<NumberAnimation> numberAnimation;
+       std::vector<geometry::Point<int> > numberPosition;
        int cursor;
-       bool monsters;
 
 };