X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FNumberAnimation.h;h=698a5f18b754c9aa93d13ba8a527a0f6c3d69ebc;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=2c96b5e816d256587d3de658931ad87248aa86c5;hpb=aedc31b88715246abc00a0ab333bea6e17bbb780;p=l2e.git

diff --git a/src/battle/NumberAnimation.h b/src/battle/NumberAnimation.h
index 2c96b5e..698a5f1 100644
--- a/src/battle/NumberAnimation.h
+++ b/src/battle/NumberAnimation.h
@@ -1,21 +1,15 @@
-/*
- * NumberAnimation.h
- *
- *  Created on: Aug 12, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_NUMBERANIMATION_H_
 #define BATTLE_NUMBERANIMATION_H_
 
-#include "../graphics/ComplexAnimation.h"
-
-#include "../geometry/Point.h"
-
 namespace app {
-	class Application;
 	class State;
 }
+namespace math {
+	template<class>
+	class Vector;
+}
+
+#include "../graphics/Animation.h"
 
 namespace battle {
 
@@ -23,7 +17,7 @@ class NumberAnimation {
 
 public:
 	NumberAnimation() : number(-1) { }
-	NumberAnimation(int number, const graphics::ComplexAnimation &prototype, const graphics::Sprite *numbers);
+	NumberAnimation(int number, const graphics::Animation *prototype, const graphics::Sprite *numbers);
 
 public:
 	void Start(app::State &);
@@ -33,11 +27,11 @@ public:
 	int Width() const;
 	int Height() const;
 
-	void Draw(SDL_Surface *dest, const geometry::Point<int> &position) const;
+	void Draw(SDL_Surface *dest, const math::Vector<int> &position) const;
 
 private:
 	int number;
-	graphics::ComplexAnimation animation[4];
+	graphics::AnimationRunner animation[4];
 
 };