switched to static type IDs

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

diff --git a/src/graphics/Frame.cpp b/src/graphics/Frame.cpp
index 01264e8321921e4f2c55d0e14611c1547a9070fe..46fa1b59db7c799255c282f90e9fe92c654a509d 100644 (file)
--- a/src/graphics/Frame.cpp
+++ b/src/graphics/Frame.cpp
@@ -7,10 +7,12 @@
 
 #include "Frame.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using geometry::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace graphics {
@@ -122,20 +124,17 @@ void Frame::Draw(SDL_Surface *dest, const Vector<int> &position, int width, int
 void Frame::CreateTypeDescription() {
        Frame f;
 
-       int imageId(TypeDescription::GetTypeId("Image"));
-       int vectorId(TypeDescription::GetTypeId("Vector"));
-
-       TypeDescription &td(TypeDescription::CreateOrGet("Frame"));
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "Frame"));
        td.SetDescription(
                        "A frame is basically a border + a background texture.\n"
                        "It splits an image into 3*3 parts where the edges are kept as is and the sides and the middle part are repeated as needed.");
        td.SetConstructor(&Construct);
        td.SetSize(sizeof(Frame));
 
-       td.AddField("image", FieldDescription(((char *)&f.surface) - ((char *)&f), imageId).SetReferenced().SetDescription("the underlying graphic from which the frame parts are cut"));
-       td.AddField("border", FieldDescription(((char *)&f.borderSize) - ((char *)&f), vectorId).SetDescription("size of the border part, dimensions of top-left corner"));
-       td.AddField("repeat", FieldDescription(((char *)&f.repeatSize) - ((char *)&f), vectorId).SetDescription("size of the repeat part, dimensions of a single tile of the background texture"));
-       td.AddField("offset", FieldDescription(((char *)&f.offset) - ((char *)&f), vectorId).SetDescription("offset into the image where to start cutting, coordinates of the top-left corner on the image"));
+       td.AddField("image", FieldDescription(((char *)&f.surface) - ((char *)&f), Interpreter::IMAGE_ID).SetReferenced().SetDescription("the underlying graphic from which the frame parts are cut"));
+       td.AddField("border", FieldDescription(((char *)&f.borderSize) - ((char *)&f), Interpreter::VECTOR_ID).SetDescription("size of the border part, dimensions of top-left corner"));
+       td.AddField("repeat", FieldDescription(((char *)&f.repeatSize) - ((char *)&f), Interpreter::VECTOR_ID).SetDescription("size of the repeat part, dimensions of a single tile of the background texture"));
+       td.AddField("offset", FieldDescription(((char *)&f.offset) - ((char *)&f), Interpreter::VECTOR_ID).SetDescription("offset into the image where to start cutting, coordinates of the top-left corner on the image"));
 }
 
 void Frame::Construct(void *data) {