1 files changed, 6 insertions, 7 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 8b07882..b054804 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -44,8 +44,7 @@ Transmission::map_t Server::calculateUpdates()
   {
     i.next();
     Actor *actor = m_actors.value(i.key());
-    QPoint mapPosition = actor->pos().toPoint();
-    mapPosition = CoordToMapPosition(actor->pos().toPoint());
+    QPoint mapPosition = CoordToMapPosition(actor->pos().toPoint());
     qDebug() << "actor " << i.key() << " is at " << mapPosition << "moving " << i.value();
 
     QPoint newMapPosition = mapPosition;
@@ -87,6 +86,7 @@ Transmission::map_t Server::calculateUpdates()
       if (oldItem->eaten())
         map[mapPosition.x()][mapPosition.y()] = Transmission::empty;
     }
+
     // new item
     PixmapItem *item = visualMap[newMapPosition.x()][newMapPosition.y()];
     if (item != NULL && oldItem != item)
@@ -95,7 +95,6 @@ Transmission::map_t Server::calculateUpdates()
       {
         /* movement invalid. e.g. move against wall */
         newMapPosition = mapPosition;
-        m_actorMovements[i.key()] = Actor::None;
       }
       else
       {
@@ -109,11 +108,11 @@ Transmission::map_t Server::calculateUpdates()
     }
     // </t3h g4m2 10gic>
 
+    if (mapPosition == newMapPosition)
+      m_actorMovements[i.key()] = Actor::None;
 
-    //map[mapPosition.x()][mapPosition.y()] = Transmission::empty;
-    map[newMapPosition.x()][newMapPosition.y()] |=
-        Transmission::pacman | i.key() |
-        Util::actorMovementToTransmission(i.value());
+    map[newMapPosition.x()][newMapPosition.y()] |= Transmission::pacman |
+        i.key() | Util::actorMovementToTransmission(i.value());
 
     if (i.value() == Actor::None)
     {