switched to static type IDs

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

diff --git a/src/graphics/Sprite.cpp b/src/graphics/Sprite.cpp
index 2495cadd86c101092131e9757b8261ee92c1fe1e..5b50096696c4afb6b46105379cd983b9cbe9c306 100644 (file)
--- a/src/graphics/Sprite.cpp
+++ b/src/graphics/Sprite.cpp
@@ -7,10 +7,12 @@
 
 #include "Sprite.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using geometry::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace graphics {
@@ -44,19 +46,16 @@ void Sprite::Draw(SDL_Surface *dest, const Vector<int> &position, int col, int r
 void Sprite::CreateTypeDescription() {
        Sprite s;
 
-       int imageId(TypeDescription::GetTypeId("Image"));
-       int vectorId(TypeDescription::GetTypeId("Vector"));
-
-       TypeDescription &td(TypeDescription::CreateOrGet("Sprite"));
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "Sprite"));
        td.SetDescription(
                        "An image + a size and offset.\n"
                        "The resulting section or a section offset by a multiple of its size can be drawn.");
        td.SetConstructor(&Construct);
        td.SetSize(sizeof(Sprite));
 
-       td.AddField("image", FieldDescription(((char *)&s.surface) - ((char *)&s), imageId).SetReferenced().SetDescription("the image to cut this sprite from"));
-       td.AddField("size", FieldDescription(((char *)&s.size) - ((char *)&s), vectorId).SetDescription("dimensions of the sprite"));
-       td.AddField("offset", FieldDescription(((char *)&s.offset) - ((char *)&s), vectorId).SetDescription("offset into the image, top-left corner of the sprite's (0,0) clip"));
+       td.AddField("image", FieldDescription(((char *)&s.surface) - ((char *)&s), Interpreter::IMAGE_ID).SetReferenced().SetDescription("the image to cut this sprite from"));
+       td.AddField("size", FieldDescription(((char *)&s.size) - ((char *)&s), Interpreter::VECTOR_ID).SetDescription("dimensions of the sprite"));
+       td.AddField("offset", FieldDescription(((char *)&s.offset) - ((char *)&s), Interpreter::VECTOR_ID).SetDescription("offset into the image, top-left corner of the sprite's (0,0) clip"));
 }
 
 void Sprite::Construct(void *data) {