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

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index 610e585..9929534 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -7,13 +7,21 @@
 
 #include "Entity.h"
 
+#include "../loader/TypeDescription.h"
+
 using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 
 namespace map {
 
 Entity::Entity()
 : follower(0)
 , animation(0)
+, sprite(0)
+, partyLayout(0)
+, monsters(0)
+, numMonsters(0)
 , orientation(ORIENTATION_NORTH)
 , speed(0)
 , flags(0) {
@@ -24,7 +32,9 @@ Entity::Entity()
 void Entity::SetOrientation(Orientation o) {
 	orientation = o;
 	UpdateVelocity();
-	runner.SetColOffset(orientation);
+	if (CanTurn()) {
+		runner.SetColOffset(orientation);
+	}
 }
 
 void Entity::SetSpeed(float s) {
@@ -32,6 +42,7 @@ void Entity::SetSpeed(float s) {
 	UpdateVelocity();
 }
 
+
 void Entity::StartAnimation(app::Application &ctrl) {
 	runner.Start(ctrl);
 }
@@ -44,6 +55,20 @@ 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);
@@ -63,6 +88,9 @@ void Entity::RemoveFollower(Entity *f) {
 void Entity::SetAnimation(const graphics::Animation *a) {
 	animation = a;
 	runner.ChangeAnimation(animation);
+	if (!sprite) {
+		sprite = animation->GetSprite();
+	}
 }
 
 
@@ -105,7 +133,46 @@ void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
 	if (runner.Running()) {
 		runner.Draw(dest, offset + position + spriteOffset);
 	} else {
-		animation->GetSprite()->Draw(dest, offset + position + spriteOffset, 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();
+		}
 	}
 }