trigger handling in map state

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

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index c14c9a0e7321a25b43e5fa64875545c3be974dd5..b9fba9797acc17246783793dac4cc4dfdf8ed1d1 100644 (file)
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -12,15 +12,56 @@ using geometry::Vector;
 namespace map {
 
 Entity::Entity()
-: sprite(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::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 +72,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);
        }
 }