switched to static type IDs

[l2e.git] / src / map / Tile.cpp

diff --git a/src/map/Tile.cpp b/src/map/Tile.cpp
index 650bbdbc00b1397d7f9b0741c0e2f260b525569c..9f75d229d0af60e1b3ee312df0d943fe3443985d 100644 (file)
--- a/src/map/Tile.cpp
+++ b/src/map/Tile.cpp
@@ -7,9 +7,11 @@
 
 #include "Tile.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace map {
@@ -24,17 +26,13 @@ Tile::Tile()
 void Tile::CreateTypeDescription() {
        Tile t;
 
-       int imageId(TypeDescription::GetTypeId("Image"));
-       int numberId(TypeDescription::GetTypeId("Number"));
-       int vectorId(TypeDescription::GetTypeId("Vector"));
-
-       TypeDescription &td(TypeDescription::CreateOrGet("Tile"));
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "Tile"));
        td.SetConstructor(&Construct);
        td.SetSize(sizeof(Tile));
 
-       td.AddField("battlebg", FieldDescription(((char *)&t.battlebg) - ((char *)&t), imageId).SetReferenced());
-       td.AddField("t", FieldDescription(((char *)&t.offset) - ((char *)&t), vectorId));
-       td.AddField("flags", FieldDescription(((char *)&t.flags) - ((char *)&t), numberId));
+       td.AddField("battlebg", FieldDescription(((char *)&t.battlebg) - ((char *)&t), Interpreter::IMAGE_ID).SetReferenced());
+       td.AddField("t", FieldDescription(((char *)&t.offset) - ((char *)&t), Interpreter::VECTOR_ID));
+       td.AddField("flags", FieldDescription(((char *)&t.flags) - ((char *)&t), Interpreter::NUMBER_ID));
 
 }