implemented followers

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

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index 08be97b96c93208ab95774ed4168377e02cc007d..666db7a2d2f656b0104b57dc4fbb886a6cd815f0 100644 (file)
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -87,11 +87,10 @@ void Entity::UpdateVelocity() {
 }
 
 
-bool Entity::TileLock(int width, int height) const {
-       Vector<int> tilePosition(
-                       position.X() - (width / 2),
-                       position.Y());
-       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);
 }
 
 
@@ -103,9 +102,9 @@ void Entity::Update(float deltaT) {
 void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
        // TODO: configurable sprite offsets
        if (runner.Running()) {
-               runner.DrawCenter(dest, offset + position);
+               runner.Draw(dest, offset + position + spriteOffset);
        } else {
-               animation->GetSprite()->DrawCenter(dest, offset + position, orientation);
+               animation->GetSprite()->Draw(dest, offset + position + spriteOffset, orientation);
        }
 }