X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FComplexAnimation.h;h=380ea2a066f831590f9e744d8215944ffdb239ef;hb=0e7b9eca67383e45e04aa419cb783c92722f7801;hp=e35895d9ae5f59c5f03c01cbb20ae0a3a0e6cb00;hpb=b02da898c7c8a08141df4e797774a61cf5e0163f;p=l2e.git

diff --git a/src/graphics/ComplexAnimation.h b/src/graphics/ComplexAnimation.h
index e35895d..380ea2a 100644
--- a/src/graphics/ComplexAnimation.h
+++ b/src/graphics/ComplexAnimation.h
@@ -1,14 +1,8 @@
-/*
- * ComplexAnimation.h
- *
- *  Created on: Aug 12, 2012
- *      Author: holy
- */
-
 #ifndef GRAPHICS_COMPLEXANIMATION_H_
 #define GRAPHICS_COMPLEXANIMATION_H_
 
 #include "Animation.h"
+#include "../loader/noinit.h"
 
 namespace graphics {
 
@@ -16,29 +10,35 @@ class ComplexAnimation
 : public Animation {
 
 public:
-	ComplexAnimation() : frames(0), numFrames(0) { }
-	ComplexAnimation(const Sprite *sprite, int frameTime, bool repeat = false)
-	: Animation(sprite, frameTime, repeat), frames(0), numFrames(0) { }
+	static const int TYPE_ID = 402;
+
+public:
+	ComplexAnimation();
+	ComplexAnimation(const Sprite *sprite, int frameTime, bool repeat = false);
+protected:
+	ComplexAnimation(loader::noinit_t);
 
 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; }
 
 	static void CreateTypeDescription();
 	static void Construct(void *);
+	static void Initialize(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;
@@ -48,4 +48,4 @@ private:
 
 }
 
-#endif /* GRAPHICS_COMPLEXANIMATION_H_ */
+#endif