X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.cpp;h=fd2cc686787d3474054462be551812ffe9f07ee8;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=99295344dbd52127a2f58c6e9f17ed27161d5a2c;hpb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;p=l2e.git

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index 9929534..fd2cc68 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -1,16 +1,19 @@
-/*
- * Entity.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "Entity.h"
 
+#include "../battle/Monster.h"
+#include "../battle/PartyLayout.h"
+#include "../graphics/Animation.h"
+#include "../graphics/Sprite.h"
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
-using geometry::Vector;
+using battle::Monster;
+using battle::PartyLayout;
+using graphics::Animation;
+using graphics::Sprite;
+using math::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace map {
@@ -116,7 +119,7 @@ void Entity::UpdateVelocity() {
 }
 
 
-bool Entity::TileLock(const geometry::Vector<int> &tileSize) const {
+bool Entity::TileLock(const math::Vector<int> &tileSize) const {
 	// TODO: change position to point to the top-left corner of a tile
 	Vector<int> tilePosition(position);
 	return (tilePosition.X() % tileSize.X() == 0) && (tilePosition.Y() % tileSize.Y() == 0);
@@ -141,25 +144,18 @@ void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
 void Entity::CreateTypeDescription() {
 	Entity e;
 
-	int animationId(TypeDescription::GetTypeId("Animation"));
-	int monsterId(TypeDescription::GetTypeId("Monster"));
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int partyLayoutId(TypeDescription::GetTypeId("PartyLayout"));
-	int spriteId(TypeDescription::GetTypeId("Sprite"));
-	int vectorId(TypeDescription::GetTypeId("Vector"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("Entity"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Entity"));
 	td.SetConstructor(&Construct);
 	td.SetLoader(&Load);
 	td.SetSize(sizeof(Entity));
 
-	td.AddField("animation", FieldDescription(((char *)&e.animation) - ((char *)&e), animationId).SetReferenced());
-	td.AddField("sprite", FieldDescription(((char *)&e.sprite) - ((char *)&e), spriteId).SetReferenced());
-	td.AddField("partyLayout", FieldDescription(((char *)&e.partyLayout) - ((char *)&e), partyLayoutId).SetReferenced());
-	td.AddField("monsters", FieldDescription(((char *)&e.monsters) - ((char *)&e), monsterId).SetReferenced().SetAggregate());
-	td.AddField("spriteOffset", FieldDescription(((char *)&e.spriteOffset) - ((char *)&e), vectorId));
-	td.AddField("position", FieldDescription(((char *)&e.tilePosition) - ((char *)&e), vectorId));
-	td.AddField("flags", FieldDescription(((char *)&e.flags) - ((char *)&e), numberId));
+	td.AddField("animation", FieldDescription(((char *)&e.animation) - ((char *)&e), Animation::TYPE_ID).SetReferenced());
+	td.AddField("sprite", FieldDescription(((char *)&e.sprite) - ((char *)&e), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("partyLayout", FieldDescription(((char *)&e.partyLayout) - ((char *)&e), PartyLayout::TYPE_ID).SetReferenced());
+	td.AddField("monsters", FieldDescription(((char *)&e.monsters) - ((char *)&e), Monster::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("spriteOffset", FieldDescription(((char *)&e.spriteOffset) - ((char *)&e), Interpreter::VECTOR_ID));
+	td.AddField("position", FieldDescription(((char *)&e.tilePosition) - ((char *)&e), Interpreter::VECTOR_ID));
+	td.AddField("flags", FieldDescription(((char *)&e.flags) - ((char *)&e), Interpreter::NUMBER_ID));
 }
 
 void Entity::Construct(void *data) {