added movement timer to track blocked movement

this should correct the behaviour of OnMove and OnGridLock calls even when walking into a wall

fixes #21 ?

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index b529e216541ac3894ee574bb4460cee4a8e06595..162db8b216186731f8852c0a4e9cc10bf7bbd128 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -71,53 +71,69 @@ void MapState::HandleEvents(const Input &input) {
 
 void MapState::UpdateWorld(float deltaT) {
        if (controlled && controlled->TileLock(map->Tileset()->Width(), map->Tileset()->Height())) {
-               Vector<int> nowLock(controlled->Position());
-               if (nowLock != lastLock) {
-                       OnGridLock();
+               OnTileLock();
+       }
+       for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+               (*i)->Update(deltaT);
+       }
+}
+
+void MapState::OnTileLock() {
+       if (moveTimer.Running() && !moveTimer.JustHit()) return;
+
+       Vector<int> nowLock(controlled->Position());
+       if (nowLock != lastLock) {
+               OnGridLock();
+               afterLock = true;
+               moveTimer.Clear();
+       } else if (moveTimer.JustHit()) {
+               OnGridLock();
+               afterLock = true;
+       }
+
+       if (nextDirection >= 0) {
+               if (afterLock) {
+                       // FIXME: this check is unreliable, see #21
+                       OnMove();
+                       afterLock = false;
                }
-               if (nextDirection >= 0) {
-                       if (afterLock) {
-                               // FIXME: this check is unreliable, see #21
-                               OnMove();
-                               afterLock = false;
-                       }
-                       controlled->SetOrientation(Entity::Orientation(nextDirection));
-                       const Tile &tile(map->TileAt(controlled->Position()));
-                       bool blocked(false);
-                       switch (controlled->GetOrientation()) {
-                               case Entity::ORIENTATION_NORTH:
-                                       blocked = tile.BlocksNorth();
-                                       break;
-                               case Entity::ORIENTATION_EAST:
-                                       blocked = tile.BlocksEast();
-                                       break;
-                               case Entity::ORIENTATION_SOUTH:
-                                       blocked = tile.BlocksSouth();
-                                       break;
-                               case Entity::ORIENTATION_WEST:
-                                       blocked = tile.BlocksWest();
-                                       break;
-                       }
-                       if (!blocked) {
-                               controlled->SetSpeed(walkingSpeed);
-                       } else {
-                               controlled->SetSpeed(0.0f);
-                       }
-                       if (!controlled->AnimationRunning()) {
-                               controlled->StartAnimation(*this);
-                       }
+               controlled->SetOrientation(Entity::Orientation(nextDirection));
+               const Tile &tile(map->TileAt(controlled->Position()));
+               bool blocked(false);
+               switch (controlled->GetOrientation()) {
+                       case Entity::ORIENTATION_NORTH:
+                               blocked = tile.BlocksNorth();
+                               break;
+                       case Entity::ORIENTATION_EAST:
+                               blocked = tile.BlocksEast();
+                               break;
+                       case Entity::ORIENTATION_SOUTH:
+                               blocked = tile.BlocksSouth();
+                               break;
+                       case Entity::ORIENTATION_WEST:
+                               blocked = tile.BlocksWest();
+                               break;
+               }
+               if (!blocked) {
+                       controlled->SetSpeed(walkingSpeed);
+                       moveTimer.Clear();
                } else {
                        controlled->SetSpeed(0.0f);
-                       controlled->StopAnimation();
+                       if (!moveTimer.Running()) {
+                               int tileSize((controlled->GetOrientation() % 2) ? map->Tileset()->Width() : map->Tileset()->Height());
+                               moveTimer = PhysicsTimers().StartInterval(tileSize/walkingSpeed);
+                       }
                }
-               if (nowLock != lastLock) {
-                       lastLock = nowLock;
-                       afterLock = true;
+               if (!controlled->AnimationRunning()) {
+                       controlled->StartAnimation(*this);
                }
+       } else {
+               controlled->SetSpeed(0.0f);
+               controlled->StopAnimation();
+               moveTimer.Clear();
        }
-       for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
-               (*i)->Update(deltaT);
-       }
+
+       lastLock = nowLock;
 }
 
 void MapState::OnGridLock() {

diff --git a/src/map/MapState.h b/src/map/MapState.h
index b753ccfd61201aa1e2decb13f586c6bda05ef64d..34ebdd2f15fc7dd9076392aec6357fa16ea0dacc 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -44,6 +44,7 @@ public:
 
 private:
        static bool ZCompare(const Entity *lhs, const Entity *rhs);
+       void OnTileLock();
        void OnGridLock();
        void OnMove();
 
@@ -52,6 +53,7 @@ private:
 private:
        Map *map;
        Entity *controlled;
+       app::Timer<float> moveTimer;
        geometry::Vector<float> tempTarget;
        geometry::Vector<int> lastLock;
        graphics::Camera camera;