switched to static type IDs

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

diff --git a/src/map/Trigger.cpp b/src/map/Trigger.cpp
index ff4863d41c4e1f7a6177d7264903df8f3d1c43f7..bc8f16363fa5be76f39fb1b6b92ddfe4fcd58e66 100644 (file)
--- a/src/map/Trigger.cpp
+++ b/src/map/Trigger.cpp
@@ -7,9 +7,11 @@
 
 #include "Trigger.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace map {
@@ -24,17 +26,13 @@ Trigger::Trigger()
 void Trigger::CreateTypeDescription() {
        Trigger t;
 
-       int numberId(TypeDescription::GetTypeId("Number"));
-       int scriptId(TypeDescription::GetTypeId("Script"));
-       int vectorId(TypeDescription::GetTypeId("Vector"));
-
-       TypeDescription &td(TypeDescription::CreateOrGet("Trigger"));
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "Trigger"));
        td.SetConstructor(&Construct);
        td.SetSize(sizeof(Trigger));
 
-       td.AddField("script", FieldDescription(((char *)&t.script) - ((char *)&t), scriptId).SetReferenced());
-       td.AddField("position", FieldDescription(((char *)&t.tilePosition) - ((char *)&t), vectorId));
-       td.AddField("type", FieldDescription(((char *)&t.type) - ((char *)&t), numberId));
+       td.AddField("script", FieldDescription(((char *)&t.script) - ((char *)&t), Interpreter::SCRIPT_ID).SetReferenced());
+       td.AddField("position", FieldDescription(((char *)&t.tilePosition) - ((char *)&t), Interpreter::VECTOR_ID));
+       td.AddField("type", FieldDescription(((char *)&t.type) - ((char *)&t), Interpreter::NUMBER_ID));
 }
 
 void Trigger::Construct(void *data) {