renamed namespace geometry -> math

[l2e.git] / src / battle / NumberAnimation.cpp

diff --git a/src/battle/NumberAnimation.cpp b/src/battle/NumberAnimation.cpp
index 7002f57c8c7e679f61630429435cbb1a3efab1ed..e3b27ba5dfe0e326800fda3f1ddafb1ab9800f34 100644 (file)
--- a/src/battle/NumberAnimation.cpp
+++ b/src/battle/NumberAnimation.cpp
@@ -1,29 +1,22 @@
-/*
- * NumberAnimation.cpp
- *
- *  Created on: Aug 12, 2012
- *      Author: holy
- */
-
 #include "NumberAnimation.h"
 
-#include "../geometry/operators.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
+#include "../graphics/Sprite.h"
 
 using app::State;
-using geometry::Point;
-using geometry::Vector;
-using graphics::ComplexAnimation;
+using math::Vector;
+using graphics::Animation;
+using graphics::AnimationRunner;
 using graphics::Sprite;
 
 namespace battle {
 
-NumberAnimation::NumberAnimation(int number, const ComplexAnimation &a, const Sprite *numbers)
+NumberAnimation::NumberAnimation(int number, const Animation *a, const Sprite *numbers)
 : number(number) {
-       animation[0] = a;
-       animation[1] = a;
-       animation[2] = a;
-       animation[3] = a;
+       animation[0] = AnimationRunner(a);
+       animation[1] = AnimationRunner(a);
+       animation[2] = AnimationRunner(a);
+       animation[3] = AnimationRunner(a);
 
        animation[0].ChangeSprite(numbers);
        animation[1].ChangeSprite(numbers);
@@ -86,8 +79,8 @@ int NumberAnimation::Height() const {
        return animation[0].GetSprite()->Height();
 }
 
-void NumberAnimation::Draw(SDL_Surface *dest, const Point<int> &positionIn) const {
-       Point<int> position(positionIn);
+void NumberAnimation::Draw(SDL_Surface *dest, const Vector<int> &positionIn) const {
+       Vector<int> position(positionIn);
        Vector<int> step(animation[0].GetSprite()->Width(), 0);
        if (number > 999) {
                if (animation[0].Running()) {