X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;fp=src%2Floader%2FInterpreter.cpp;h=5adb08e237f20b42c4fb6b9bf4cdf7cfa462d981;hb=1907ca03c5e865c4d398170042aa384c67ffff29;hp=6bb022f1e4c6c46d354c1afc62fa6710be9da1e3;hpb=fb9bd716a1740e41efbb08a3bfa42e441d64c693;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 6bb022f..5adb08e 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -757,12 +757,12 @@ void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::s
 
 void Interpreter::CreateTypeDescriptions() {
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Boolean"));
+		TypeDescription &td(TypeDescription::Create(BOOLEAN_ID, "Boolean"));
 		td.SetDescription("Logical value which can be either true or false.");
 		td.SetSize(sizeof(bool));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Color"));
+		TypeDescription &td(TypeDescription::Create(COLOR_ID, "Color"));
 		td.SetDescription(
 				"A color in RGB format with an optional alpha channel.\n"
 				"Components range from 0 to 255.\n"
@@ -770,34 +770,33 @@ void Interpreter::CreateTypeDescriptions() {
 		td.SetSize(sizeof(Color));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Image"));
+		TypeDescription &td(TypeDescription::Create(IMAGE_ID, "Image"));
 		td.SetDescription("Path to a PNG file with image data.");
 		td.SetSize(sizeof(SDL_Surface));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Number"));
+		TypeDescription &td(TypeDescription::Create(NUMBER_ID, "Number"));
 		td.SetDescription("A signed integer.");
 		td.SetSize(sizeof(int));
 	}
-	{
-		int stringId(TypeDescription::GetTypeId("String"));
-		TypeDescription &td(TypeDescription::CreateOrGet("Path"));
+	{;
+		TypeDescription &td(TypeDescription::Create(PATH_ID, "Path"));
 		td.SetDescription("A path in the filesystem which is interpreted relative to the source file's location.");
 		td.SetSize(1);
-		td.AddSupertype(stringId, 0);
+		td.AddSupertype(STRING_ID, 0);
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Script"));
+		TypeDescription &td(TypeDescription::Create(SCRIPT_ID, "Script"));
 		td.SetDescription("Collection of commands that define a behaviour.");
 		td.SetSize(sizeof(Script));
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("String"));
+		TypeDescription &td(TypeDescription::Create(STRING_ID, "String"));
 		td.SetDescription("Some characters.");
 		td.SetSize(1);
 	}
 	{
-		TypeDescription &td(TypeDescription::CreateOrGet("Vector"));
+		TypeDescription &td(TypeDescription::Create(VECTOR_ID, "Vector"));
 		td.SetDescription("A pair of numbers usually describing a 2D translation or offset.");
 		td.SetSize(sizeof(Vector<int>));
 	}