merged Point into Vector

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

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index 19e3200a42f2825504055ba1983d8fcffc1eeff6..19c6967379b258cafad54e48ac48ee5ecaccbbbe 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>
 
@@ -53,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;
 
 };