added constructors for described types

[l2e.git] / src / graphics / ComplexAnimation.cpp

diff --git a/src/graphics/ComplexAnimation.cpp b/src/graphics/ComplexAnimation.cpp
index b54baf9396aeb7e56b1c26efe3198c3571162327..cb125f5ac20f706fd23e4d2ab1b0c2c12f13dda6 100644 (file)
--- a/src/graphics/ComplexAnimation.cpp
+++ b/src/graphics/ComplexAnimation.cpp
@@ -17,27 +17,35 @@ namespace graphics {
 void ComplexAnimation::CreateTypeDescription() {
        ComplexAnimation ca;
        Animation *a(&ca);
-       TypeDescription &td(TypeDescription::CreateOrGet("ComplexAnimation"));
-
-       td.SetSize(sizeof(ComplexAnimation));
-       td.AddSupertype(TypeDescription::GetTypeId("Animation"), ((char *)a) - ((char *)&ca));
 
+       int animationId(TypeDescription::GetTypeId("Animation"));
+       int boolId(TypeDescription::GetTypeId("Boolean"));
        int frameId(TypeDescription::GetTypeId("ComplexAnimationFrame"));
+       int numberId(TypeDescription::GetTypeId("Number"));
+       int spriteId(TypeDescription::GetTypeId("Sprite"));
+       int vectorId(TypeDescription::GetTypeId("Vector"));
+
+       TypeDescription &td(TypeDescription::CreateOrGet("ComplexAnimation"));
+       td.SetConstructor(&Construct);
+       td.SetSize(sizeof(ComplexAnimation));
+       td.AddSupertype(animationId, ((char *)a) - ((char *)&ca));
 
+       Animation::AddFields(td, ca, ((char *)a) - ((char *)&ca), boolId, numberId, spriteId);
        td.AddField("frames", FieldDescription(((char *)&ca.frames) - ((char *)&ca), frameId, true, true));
 
 
        FrameProp fp;
-       TypeDescription &ftd(TypeDescription::CreateOrGet("ComplexAnimationFrame"));
 
+       TypeDescription &ftd(TypeDescription::CreateOrGet("ComplexAnimationFrame"));
        ftd.SetSize(sizeof(FrameProp));
 
-       int numberId(TypeDescription::GetTypeId("Number"));
-       int vectorId(TypeDescription::GetTypeId("Vector"));
-
        ftd.AddField("column", FieldDescription(((char *)&fp.col) - ((char *)&fp), numberId, false));
        ftd.AddField("row", FieldDescription(((char *)&fp.row) - ((char *)&fp), numberId, false));
        ftd.AddField("disposition", FieldDescription(((char *)&fp.disposition) - ((char *)&fp), vectorId, false));
 }
 
+void ComplexAnimation::Construct(void *data) {
+       new (data) ComplexAnimation;
+}
+
 }