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

diff --git a/src/map/Area.cpp b/src/map/Area.cpp
index 1b9488a..e7d6f66 100644
--- a/src/map/Area.cpp
+++ b/src/map/Area.cpp
@@ -1,21 +1,17 @@
-/*
- * Area.cpp
- *
- *  Created on: Sep 26, 2012
- *      Author: holy
- */
-
 #include "Area.h"
 
 #include "Tile.h"
 #include "../graphics/Sprite.h"
 #include "../loader/TypeDescription.h"
+#include "../loader/Interpreter.h"
+#include "../math/Vector.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
-using geometry::Vector;
+using math::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace map {
@@ -29,7 +25,7 @@ Area::Area()
 }
 
 
-Tile *Area::TileAt(const geometry::Vector<int> &offset) {
+Tile *Area::TileAt(const math::Vector<int> &offset) {
 	int tileIndex(offset.Y() * width + offset.X());
 	if (tileIndex < numTiles) {
 		return tiles +tileIndex;
@@ -38,7 +34,7 @@ Tile *Area::TileAt(const geometry::Vector<int> &offset) {
 	}
 }
 
-const Tile *Area::TileAt(const geometry::Vector<int> &offset) const {
+const Tile *Area::TileAt(const math::Vector<int> &offset) const {
 	int tileIndex(offset.Y() * width + offset.X());
 	if (tileIndex < numTiles) {
 		return tiles +tileIndex;
@@ -93,17 +89,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) {