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

diff --git a/src/battle/NumberAnimation.h b/src/battle/NumberAnimation.h
index 2c96b5e..16208dd 100644
--- a/src/battle/NumberAnimation.h
+++ b/src/battle/NumberAnimation.h
@@ -1,21 +1,9 @@
-/*
- * 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;
-}
+#include "../app/fwd.h"
+#include "../geometry/Vector.h"
+#include "../graphics/Animation.h"
 
 namespace battle {
 
@@ -23,7 +11,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 +21,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 geometry::Vector<int> &position) const;
 
 private:
 	int number;
-	graphics::ComplexAnimation animation[4];
+	graphics::AnimationRunner animation[4];
 
 };