X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.cpp;h=08be97b96c93208ab95774ed4168377e02cc007d;hb=a1c89e41e38eca790e168b8acd3beee974685fcd;hp=c14c9a0e7321a25b43e5fa64875545c3be974dd5;hpb=657eed00ae73b8d06470cec0d955aeada537a90d;p=l2e.git

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index c14c9a0..08be97b 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -12,15 +12,85 @@ using geometry::Vector;
 namespace map {
 
 Entity::Entity()
-: sprite(0) {
+: follower(0)
+, animation(0)
+, orientation(ORIENTATION_NORTH)
+, speed(0) {
+	runner.SetFrameShift(1);
+}
+
+
+void Entity::SetOrientation(Orientation o) {
+	orientation = o;
+	UpdateVelocity();
+	runner.SetColOffset(orientation);
+}
+
+void Entity::SetSpeed(float s) {
+	speed = 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::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);
+}
+
+
+void Entity::UpdateVelocity() {
+	if (speed == 0.0f) {
+		velocity = Vector<float>();
+		return;
+	}
+	switch (orientation) {
+		case ORIENTATION_NORTH:
+			velocity = Vector<float>(0.0f, -speed);
+			break;
+		case ORIENTATION_EAST:
+			velocity = Vector<float>(speed, 0.0f);
+			break;
+		case ORIENTATION_SOUTH:
+			velocity = Vector<float>(0.0f, speed);
+			break;
+		case ORIENTATION_WEST:
+			velocity = Vector<float>(-speed, 0.0f);
+			break;
+	}
 }
 
 
 bool Entity::TileLock(int width, int height) const {
 	Vector<int> tilePosition(
 			position.X() - (width / 2),
-			position.Y() - height);
+			position.Y());
 	return (tilePosition.X() % width == 0) && (tilePosition.Y() % height == 0);
 }
 
@@ -31,10 +101,11 @@ void Entity::Update(float deltaT) {
 
 
 void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
-	if (animation.Running()) {
-		animation.DrawCenterBottom(dest, offset + position);
+	// TODO: configurable sprite offsets
+	if (runner.Running()) {
+		runner.DrawCenter(dest, offset + position);
 	} else {
-		sprite->DrawCenterBottom(dest, offset + position);
+		animation->GetSprite()->DrawCenter(dest, offset + position, orientation);
 	}
 }