switched to static type IDs

[l2e.git] / src / common / TargetingMode.cpp

diff --git a/src/common/TargetingMode.cpp b/src/common/TargetingMode.cpp
index 9f8972ca50710f8f65be21f4fc233ca7d7bcd916..19b41ec2b469e88773314660252274d9262fff63 100644 (file)
--- a/src/common/TargetingMode.cpp
+++ b/src/common/TargetingMode.cpp
@@ -7,9 +7,11 @@
 
 #include "TargetingMode.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace common {
@@ -17,16 +19,13 @@ namespace common {
 void TargetingMode::CreateTypeDescription() {
        TargetingMode t;
 
-       int boolId(TypeDescription::GetTypeId("Boolean"));
-       int numberId(TypeDescription::GetTypeId("Number"));
-
-       TypeDescription &td(TypeDescription::CreateOrGet("TargetingMode"));
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "TargetingMode"));
        td.SetDescription("Specifies how selection of a target (e.g. for a spell) is performed.");
        td.SetConstructor(&Construct);
        td.SetSize(sizeof(TargetingMode));
 
-       td.AddField("faction", FieldDescription(((char *)&t.ally) - ((char *)&t), boolId).SetDescription("targetted faction; true for ally, false for enemy"));
-       td.AddField("mode", FieldDescription(((char *)&t.mode) - ((char *)&t), numberId).SetDescription("attack mode; 0 = all, 1 = multiple, 2 = single"));
+       td.AddField("faction", FieldDescription(((char *)&t.ally) - ((char *)&t), Interpreter::BOOLEAN_ID).SetDescription("targetted faction; true for ally, false for enemy"));
+       td.AddField("mode", FieldDescription(((char *)&t.mode) - ((char *)&t), Interpreter::NUMBER_ID).SetDescription("attack mode; 0 = all, 1 = multiple, 2 = single"));
 }
 
 void TargetingMode::Construct(void *data) {