1 files changed, 18 insertions, 1 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index b054804..c33c559 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -43,6 +43,10 @@ Transmission::map_t Server::calculateUpdates()
   while (i.hasNext())
   {
     i.next();
+    int turn = 0;
+
+invalid_direction:
+    ++turn;
     Actor *actor = m_actors.value(i.key());
     QPoint mapPosition = CoordToMapPosition(actor->pos().toPoint());
     qDebug() << "actor " << i.key() << " is at " << mapPosition << "moving " << i.value();
@@ -108,8 +112,21 @@ Transmission::map_t Server::calculateUpdates()
     }
     // </t3h g4m2 10gic>
 
+    /* movement didn't work - e.g. was blocked */
     if (mapPosition == newMapPosition)
-      m_actorMovements[i.key()] = Actor::None;
+    {
+      if (turn == 1)
+      {
+        /* set direction back to last known direction and try again */
+        m_actorMovements[i.key()] = actor->direction();
+        goto invalid_direction;
+      }
+      else
+      {
+        /* second turn didn't work too -> stop movement */
+        m_actorMovements[i.key()] = Actor::None;
+      }
+    }
 
     map[newMapPosition.x()][newMapPosition.y()] |= Transmission::pacman |
         i.key() | Util::actorMovementToTransmission(i.value());