X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.cpp;h=99295344dbd52127a2f58c6e9f17ed27161d5a2c;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=302ce5c195ac856ab8aafaaae7befb0b5634b226;hpb=72988b5f9bd449cffea97273bebfc788735ce14d;p=l2e.git

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index 302ce5c..9929534 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -7,22 +7,34 @@
 
 #include "Entity.h"
 
+#include "../loader/TypeDescription.h"
+
 using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 
 namespace map {
 
 Entity::Entity()
-: animation(0)
+: follower(0)
+, animation(0)
+, sprite(0)
+, partyLayout(0)
+, monsters(0)
+, numMonsters(0)
 , orientation(ORIENTATION_NORTH)
-, speed(0) {
-
+, speed(0)
+, flags(0) {
+	runner.SetFrameShift(1);
 }
 
 
 void Entity::SetOrientation(Orientation o) {
 	orientation = o;
 	UpdateVelocity();
-	runner.SetColOffset(orientation);
+	if (CanTurn()) {
+		runner.SetColOffset(orientation);
+	}
 }
 
 void Entity::SetSpeed(float s) {
@@ -30,9 +42,55 @@ void Entity::SetSpeed(float s) {
 	UpdateVelocity();
 }
 
+
+void Entity::StartAnimation(app::Application &ctrl) {
+	runner.Start(ctrl);
+}
+
+void Entity::StartAnimation(app::State &ctrl) {
+	runner.Start(ctrl);
+}
+
+void Entity::StopAnimation() {
+	runner.Stop();
+}
+
+
+void Entity::SetHandsFree() {
+	runner.SetRowOffset(0);
+}
+
+void Entity::SetCarrying() {
+	runner.SetRowOffset(2);
+}
+
+void Entity::SetPushing() {
+	runner.SetRowOffset(4);
+}
+
+
+void Entity::AddFollower(Entity *f) {
+	if (follower) {
+		follower->AddFollower(f);
+	} else {
+		follower = f;
+	}
+}
+
+void Entity::RemoveFollower(Entity *f) {
+	if (follower == f) {
+		follower = follower->follower;
+	} else if (follower) {
+		follower->RemoveFollower(f);
+	}
+}
+
 void Entity::SetAnimation(const graphics::Animation *a) {
 	animation = a;
 	runner.ChangeAnimation(animation);
+	if (!sprite) {
+		sprite = animation->GetSprite();
+	}
 }
 
 
@@ -58,11 +116,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);
 }
 
 
@@ -74,9 +131,48 @@ 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);
+		sprite->Draw(dest, offset + position + spriteOffset, CanTurn() ? orientation : 0);
+	}
+}
+
+
+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"));
+	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));
+}
+
+void Entity::Construct(void *data) {
+	new (data) Entity;
+}
+
+void Entity::Load(void *data) {
+	Entity *entity(reinterpret_cast<Entity *>(data));
+	if (entity->animation) {
+		entity->runner.ChangeAnimation(entity->animation);
+		if (!entity->sprite) {
+			entity->sprite = entity->animation->GetSprite();
+		}
 	}
 }