X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FComplexAnimation.h;h=1ed001aa341bdc6f915c5d1476f04a8d51d1acdd;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=4e2cb32a0e9146bc19a5bf73149c0248f0d27b6c;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/graphics/ComplexAnimation.h b/src/graphics/ComplexAnimation.h
index 4e2cb32..1ed001a 100644
--- a/src/graphics/ComplexAnimation.h
+++ b/src/graphics/ComplexAnimation.h
@@ -1,10 +1,3 @@
-/*
- * ComplexAnimation.h
- *
- *  Created on: Aug 12, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_COMPLEXANIMATION_H_
 #define GRAPHICS_COMPLEXANIMATION_H_
 
@@ -19,19 +12,18 @@ public:
 	static const int TYPE_ID = 402;
 
 public:
-	ComplexAnimation() : frames(0), numFrames(0) { }
-	ComplexAnimation(const Sprite *sprite, int frameTime, bool repeat = false)
-	: Animation(sprite, frameTime, repeat), frames(0), numFrames(0) { }
+	ComplexAnimation();
+	ComplexAnimation(const Sprite *sprite, int frameTime, bool repeat = false);
 
 public:
 	struct FrameProp {
 		static const int TYPE_ID = 403;
 		FrameProp() : col(0), row(0) { }
-		FrameProp(int col, int row, const geometry::Vector<int> &disposition)
+		FrameProp(int col, int row, const math::Vector<int> &disposition)
 		: col(col), row(row), disposition(disposition) {}
 		int col;
 		int row;
-		geometry::Vector<int> disposition;
+		math::Vector<int> disposition;
 	};
 	void SetFrames(const FrameProp *f, int num) { frames = f; numFrames = num; }
 
@@ -39,10 +31,10 @@ public:
 	static void Construct(void *);
 
 protected:
-	virtual int NumFrames() const { return numFrames; };
-	virtual int Col(int frame) const { return frames[frame].col; }
-	virtual int Row(int frame) const { return frames[frame].row; }
-	virtual geometry::Vector<int> Offset(int frame) const { return frames[frame].disposition; }
+	virtual int NumFrames() const;
+	virtual int Col(int frame) const;
+	virtual int Row(int frame) const;
+	virtual math::Vector<int> Offset(int frame) const;
 
 private:
 	const FrameProp *frames;