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

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index e1f970b..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 {
@@ -18,6 +21,10 @@ namespace map {
 Entity::Entity()
 : follower(0)
 , animation(0)
+, sprite(0)
+, partyLayout(0)
+, monsters(0)
+, numMonsters(0)
 , orientation(ORIENTATION_NORTH)
 , speed(0)
 , flags(0) {
@@ -28,7 +35,9 @@ Entity::Entity()
 void Entity::SetOrientation(Orientation o) {
 	orientation = o;
 	UpdateVelocity();
-	runner.SetColOffset(orientation);
+	if (CanTurn()) {
+		runner.SetColOffset(orientation);
+	}
 }
 
 void Entity::SetSpeed(float s) {
@@ -36,6 +45,7 @@ void Entity::SetSpeed(float s) {
 	UpdateVelocity();
 }
 
+
 void Entity::StartAnimation(app::Application &ctrl) {
 	runner.Start(ctrl);
 }
@@ -48,6 +58,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);
@@ -67,6 +91,9 @@ void Entity::RemoveFollower(Entity *f) {
 void Entity::SetAnimation(const graphics::Animation *a) {
 	animation = a;
 	runner.ChangeAnimation(animation);
+	if (!sprite) {
+		sprite = animation->GetSprite();
+	}
 }
 
 
@@ -92,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);
@@ -109,7 +136,7 @@ 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);
 	}
 }
 
@@ -117,16 +144,18 @@ void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
 void Entity::CreateTypeDescription() {
 	Entity e;
 
-	int animationId(TypeDescription::GetTypeId("Animation"));
-	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, true));
-	td.AddField("spriteOffset", FieldDescription(((char *)&e.spriteOffset) - ((char *)&e), vectorId, false));
+	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) {
@@ -135,7 +164,12 @@ void Entity::Construct(void *data) {
 
 void Entity::Load(void *data) {
 	Entity *entity(reinterpret_cast<Entity *>(data));
-	entity->runner.ChangeAnimation(entity->animation);
+	if (entity->animation) {
+		entity->runner.ChangeAnimation(entity->animation);
+		if (!entity->sprite) {
+			entity->sprite = entity->animation->GetSprite();
+		}
+	}
 }
 
 }