X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTrigger.cpp;h=cb65ae641cb3766a309d46d31cc9b4a9c7937a95;hb=6ad33ca7db4f2d13311e2f8a9e77e57f907a576d;hp=ff4863d41c4e1f7a6177d7264903df8f3d1c43f7;hpb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;p=l2e.git

diff --git a/src/map/Trigger.cpp b/src/map/Trigger.cpp
index ff4863d..cb65ae6 100644
--- a/src/map/Trigger.cpp
+++ b/src/map/Trigger.cpp
@@ -1,15 +1,11 @@
-/*
- * Trigger.cpp
- *
- *  Created on: Oct 3, 2012
- *      Author: holy
- */
-
 #include "Trigger.h"
 
+#include "../common/Script.h"
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace map {
@@ -24,17 +20,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) {