X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmap%2FEntity.cpp;h=01a8e9c384012a81ce15d5fc872c4342f4fab893;hb=0ad5ca97b5df217329bc319d62564a9f46ba11d7;hp=08be97b96c93208ab95774ed4168377e02cc007d;hpb=a1c89e41e38eca790e168b8acd3beee974685fcd;p=l2e.git

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index 08be97b..01a8e9c 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -7,15 +7,23 @@
 
 #include "Entity.h"
 
+#include "../loader/TypeDescription.h"
+
 using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 
 namespace map {
 
 Entity::Entity()
 : follower(0)
 , animation(0)
+, partyLayout(0)
+, monsters(0)
+, numMonsters(0)
 , orientation(ORIENTATION_NORTH)
-, speed(0) {
+, speed(0)
+, flags(0) {
 	runner.SetFrameShift(1);
 }
 
@@ -87,11 +95,10 @@ void Entity::UpdateVelocity() {
 }
 
 
-bool Entity::TileLock(int width, int height) const {
-	Vector<int> tilePosition(
-			position.X() - (width / 2),
-			position.Y());
-	return (tilePosition.X() % width == 0) && (tilePosition.Y() % height == 0);
+bool Entity::TileLock(const geometry::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);
 }
 
 
@@ -103,10 +110,39 @@ void Entity::Update(float deltaT) {
 void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
 	// TODO: configurable sprite offsets
 	if (runner.Running()) {
-		runner.DrawCenter(dest, offset + position);
+		runner.Draw(dest, offset + position + spriteOffset);
 	} else {
-		animation->GetSprite()->DrawCenter(dest, offset + position, orientation);
+		animation->GetSprite()->Draw(dest, offset + position + spriteOffset, orientation);
 	}
 }
 
+
+void Entity::CreateTypeDescription() {
+	Entity e;
+
+	int animationId(TypeDescription::GetTypeId("Animation"));
+	int monsterId(TypeDescription::GetTypeId("Monster"));
+	int partyLayoutId(TypeDescription::GetTypeId("PartyLayout"));
+	int vectorId(TypeDescription::GetTypeId("Vector"));
+
+	TypeDescription &td(TypeDescription::CreateOrGet("Entity"));
+	td.SetConstructor(&Construct);
+	td.SetLoader(&Load);
+	td.SetSize(sizeof(Entity));
+
+	td.AddField("animation", FieldDescription(((char *)&e.animation) - ((char *)&e), animationId).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));
+}
+
+void Entity::Construct(void *data) {
+	new (data) Entity;
+}
+
+void Entity::Load(void *data) {
+	Entity *entity(reinterpret_cast<Entity *>(data));
+	entity->runner.ChangeAnimation(entity->animation);
+}
+
 }