X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FArea.cpp;h=b6d02f6204f7ba0477b4c7c9df636fc2a3bad936;hb=2590fad63e8a2013c1a169c77f21931bc19f2f25;hp=1b9488a01120d045e2eddbeb0df94e402c0797a8;hpb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;p=l2e.git

diff --git a/src/map/Area.cpp b/src/map/Area.cpp
index 1b9488a..b6d02f6 100644
--- a/src/map/Area.cpp
+++ b/src/map/Area.cpp
@@ -10,12 +10,14 @@
 #include "Tile.h"
 #include "../graphics/Sprite.h"
 #include "../loader/TypeDescription.h"
+#include "../loader/Interpreter.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
 using geometry::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace map {
@@ -93,17 +95,13 @@ void Area::RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const
 void Area::CreateTypeDescription() {
 	Area a;
 
-	int imageId(TypeDescription::GetTypeId("Image"));
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int tileId(TypeDescription::GetTypeId("Tile"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("Area"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Area"));
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(Area));
 
-	td.AddField("battlebg", FieldDescription(((char *)&a.battlebg) - ((char *)&a), imageId).SetReferenced());
-	td.AddField("tiles", FieldDescription(((char *)&a.tiles) - ((char *)&a), tileId).SetReferenced().SetAggregate());
-	td.AddField("width", FieldDescription(((char *)&a.width) - ((char *)&a), numberId));
+	td.AddField("battlebg", FieldDescription(((char *)&a.battlebg) - ((char *)&a), Interpreter::IMAGE_ID).SetReferenced());
+	td.AddField("tiles", FieldDescription(((char *)&a.tiles) - ((char *)&a), Tile::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("width", FieldDescription(((char *)&a.width) - ((char *)&a), Interpreter::NUMBER_ID));
 }
 
 void Area::Construct(void *data) {