implemented followers

[l2e.git] / src / map / Entity.cpp

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index c14c9a0e7321a25b43e5fa64875545c3be974dd5..666db7a2d2f656b0104b57dc4fbb886a6cd815f0 100644 (file)
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -12,16 +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);
-       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);
 }
 
 
@@ -31,10 +100,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.Draw(dest, offset + position + spriteOffset);
        } else {
-               sprite->DrawCenterBottom(dest, offset + position);
+               animation->GetSprite()->Draw(dest, offset + position + spriteOffset, orientation);
        }
 }