X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FIkari.cpp;h=e4321497a4663f586013cb9799efd7fd37e77105;hb=1907ca03c5e865c4d398170042aa384c67ffff29;hp=3a023926b5fe8e5d94c9448c49ef03d61bda459c;hpb=fb9bd716a1740e41efbb08a3bfa42e441d64c693;p=l2e.git

diff --git a/src/common/Ikari.cpp b/src/common/Ikari.cpp
index 3a02392..e432149 100644
--- a/src/common/Ikari.cpp
+++ b/src/common/Ikari.cpp
@@ -7,9 +7,12 @@
 
 #include "Ikari.h"
 
+#include "TargetingMode.h"
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace common {
@@ -25,21 +28,16 @@ Ikari::Ikari()
 void Ikari::CreateTypeDescription() {
 	Ikari i;
 
-	int boolId(TypeDescription::GetTypeId("Boolean"));
-	int numberId(TypeDescription::GetTypeId("Number")); // FIXME: need small number type
-	int stringId(TypeDescription::GetTypeId("String"));
-	int targetsId(TypeDescription::GetTypeId("TargetingMode"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("Ikari"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Ikari"));
 	td.SetDescription(
 			"Information of a single ikari attack.");
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(Ikari));
 
-	td.AddField("name", FieldDescription(((char *)&i.name) - ((char *)&i), stringId).SetReferenced().SetDescription("the attack's name"));
-	td.AddField("cost", FieldDescription(((char *)&i.cost) - ((char *)&i), numberId).SetDescription("amount of ikari points needed and deducted for use"));
-	td.AddField("targets", FieldDescription(((char *)&i.targetingMode) - ((char *)&i), targetsId).SetDescription("how target selection is to be performed"));
-	td.AddField("type", FieldDescription(((char *)&i.isPhysical) - ((char *)&i), boolId).SetDescription("if the attack is physical (true) or magical(false)"));
+	td.AddField("name", FieldDescription(((char *)&i.name) - ((char *)&i), Interpreter::STRING_ID).SetReferenced().SetDescription("the attack's name"));
+	td.AddField("cost", FieldDescription(((char *)&i.cost) - ((char *)&i), Interpreter::NUMBER_ID).SetDescription("amount of ikari points needed and deducted for use"));
+	td.AddField("targets", FieldDescription(((char *)&i.targetingMode) - ((char *)&i), TargetingMode::TYPE_ID).SetDescription("how target selection is to be performed"));
+	td.AddField("type", FieldDescription(((char *)&i.isPhysical) - ((char *)&i), Interpreter::BOOLEAN_ID).SetDescription("if the attack is physical (true) or magical(false)"));
 }
 
 void Ikari::Construct(void *data) {