1 files changed, 8 insertions, 15 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index b0ac6f8..dd15934 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -83,21 +83,11 @@ invalid_direction:
 
     // <t3h g4m3 10gic>
     // TODO: support actors eating each other
-    // old item
-    PixmapItem *oldItem = visualMap[mapPosition.x()][mapPosition.y()];
-    if (oldItem != NULL)
-    {
-      /* set item to explicit empty
-       * and add actor that removed/has eaten that item
-       */
-      if (oldItem->eaten())
-        map[mapPosition.x()][mapPosition.y()] = Transmission::empty | actor->color();
-    }
-
-    // new item
-    PixmapItem *item = visualMap[newMapPosition.x()][newMapPosition.y()];
+    /* check if there's an item at new location of actor */
+    GameEntity *item = visualMap[newMapPosition.x()][newMapPosition.y()];
     if (item != NULL && oldItem != item)
     {
+      qDebug() << "item at new actor location found";
       if (!item->checkEnter(actor))
       {
         /* movement invalid. e.g. move against wall */
@@ -105,11 +95,11 @@ invalid_direction:
       }
       else
       {
-        // apply actions of entering this field
+        /* apply actions of entering this field */
         bool survive = item->enter(actor);
         if (!survive)
         {
-          //map[newMapPosition.x()][newMapPosition.y()] = Transmission::empty;
+          map[newMapPosition.x()][newMapPosition.y()] = Transmission::empty | actor->color();
         }
       }
     }
@@ -134,6 +124,9 @@ invalid_direction:
     map[newMapPosition.x()][newMapPosition.y()] |= Transmission::pacman |
         i.key() | Util::actorMovementToTransmission(i.value());
 
+    /* DEBUG: uncomments to disable auto-movement */
+    //m_actorMovements[i.key()] = Actor::None;
+
     if (i.value() == Actor::None)
     {
       /* set actor to non-moving */