X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=8ff7f18dc9802ea58bd537075bc6ae481e733f07;hb=1907ca03c5e865c4d398170042aa384c67ffff29;hp=3f05962a43b2e55db519f84565b362b16d748cc0;hpb=fb9bd716a1740e41efbb08a3bfa42e441d64c693;p=l2e.git

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 3f05962..8ff7f18 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -11,13 +11,16 @@
 #include "Tile.h"
 #include "Trigger.h"
 #include "../graphics/Sprite.h"
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
 using geometry::Vector;
+using graphics::Sprite;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace map {
@@ -156,23 +159,16 @@ void Map::RenderDebug(SDL_Surface *dest, const Vector<int> &inOffset) const {
 void Map::CreateTypeDescription() {
 	Map m;
 
-	int areaId(TypeDescription::GetTypeId("Area"));
-	int entityId(TypeDescription::GetTypeId("Entity"));
-	int imageId(TypeDescription::GetTypeId("Image"));
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int spriteId(TypeDescription::GetTypeId("Sprite"));
-	int triggerId(TypeDescription::GetTypeId("Trigger"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("Map"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Map"));
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(Map));
 
-	td.AddField("tileset", FieldDescription(((char *)&m.tileset) - ((char *)&m), spriteId).SetReferenced());
-	td.AddField("battlebg", FieldDescription(((char *)&m.battlebg) - ((char *)&m), imageId).SetReferenced());
-	td.AddField("areas", FieldDescription(((char *)&m.areas) - ((char *)&m), areaId).SetReferenced().SetAggregate());
-	td.AddField("triggers", FieldDescription(((char *)&m.triggers) - ((char *)&m), triggerId).SetReferenced().SetAggregate());
-	td.AddField("entities", FieldDescription(((char *)&m.entities) - ((char *)&m), entityId).SetReferenced().SetAggregate());
-	td.AddField("width", FieldDescription(((char *)&m.width) - ((char *)&m), numberId));
+	td.AddField("tileset", FieldDescription(((char *)&m.tileset) - ((char *)&m), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("battlebg", FieldDescription(((char *)&m.battlebg) - ((char *)&m), Interpreter::IMAGE_ID).SetReferenced());
+	td.AddField("areas", FieldDescription(((char *)&m.areas) - ((char *)&m), Area::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("triggers", FieldDescription(((char *)&m.triggers) - ((char *)&m), Trigger::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("entities", FieldDescription(((char *)&m.entities) - ((char *)&m), Entity::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("width", FieldDescription(((char *)&m.width) - ((char *)&m), Interpreter::NUMBER_ID));
 }
 
 void Map::Construct(void *data) {