1 files changed, 63 insertions, 37 deletions

diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index 1ecf31b..f6b8145 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -25,7 +25,7 @@ void SceneHolder::reset()
   /* remove actors from scene so they don't get deleted during clear */
   foreach(Actor *actor, m_actors)
   {
-    actor->resetAnimation();
+    actor->reset();
     removeItem(actor);
   }
 
@@ -88,8 +88,20 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
   if (cur == Transmission::none)
     return;
 
+  /* we may have multiple colors in one position (e.g during eating another pacman) */
   Color::Color color = static_cast<Color::Color>(cur & Transmission::color_mask);
-  GameEntity* item = NULL;
+  QList<Color::Color> colors;
+  if (color == Color::none)
+    colors.append(Color::none);
+  foreach(Color::Color col, m_eatingorder.toSet())
+  {
+    if (color & col)
+      colors.append(col);
+  }
+  Q_ASSERT(colors.count() > 0);
+
+  /* for now complain if there are more colors or it's a Transmission::death packet */
+  Q_ASSERT(colors.count() == 1 || cur & Transmission::death);
 
   if (cur & Transmission::empty)
   {
@@ -102,13 +114,13 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
       m_oldItems.append(oldItem);
 
       /* an item must be removed by an actor */
-      Actor *actor = m_actors[color];
-      if (actor == NULL)
-        Q_ASSERT(false);
+      Actor *actor = m_actors[colors.at(0)];
+      Q_ASSERT(actor != NULL);
       oldItem->onDie(actor);
     }
   }
 
+  GameEntity *item = NULL;
   if (cur == Transmission::none)
   {
     /* no update */
@@ -137,7 +149,7 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
       /* check down side */
       if (y < Constants::map_size.height && map[x][y + 1] & Transmission::block)
         neighbours |= Block::Down;
-      item = new Block(color, neighbours);
+      item = new Block(colors.at(0), neighbours);
     }
 
     if (cur & Transmission::bonuspoint)
@@ -152,41 +164,55 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
 
     if (cur & Transmission::pacman)
     {
-      /* WARNING: do NOT add actor to visualMap as visualMap-items may
-       * get deleted during update and actors are referenced in_mactors too
-       * if you REALLY need that you need to changed updateMap so that all actors
-       * will be moved before any new items get allocated (totally untested)
-       */
-      Actor *actor = m_actors.value(color, NULL);
-      if (actor == NULL)
-      {
-        actor = new Actor(color, (color == m_color));
-        m_actors[color] = actor;
-        addItem(actor);
-        actor->setPos(mapPositionToCoord(x, y));
-      }
-      else
+      foreach(color, colors)
       {
-        Actor::Movement direction = Util::transmissionMovementToActor(
-            cur & Transmission::direction_mask);
-        /* direction Actor::None is used on round change (i.e. new actor positions)
-         * it is animation-safe to use it for this direction only
+        /* WARNING: do NOT add actor to visualMap as visualMap-items may
+         * get deleted during update and actors are referenced in_mactors too
+         * if you REALLY need that you need to changed updateMap so that all actors
+         * will be moved before any new items get allocated (totally untested)
          */
-        if (direction == Actor::None)
+        Actor *actor = m_actors.value(color, NULL);
+        if (actor == NULL)
+        {
+          actor = new Actor(color, (color == m_color));
+          m_actors[color] = actor;
+          addItem(actor);
           actor->setPos(mapPositionToCoord(x, y));
-        actor->move(direction);
-        /* that's kind a hack but working right now
-         * I think that will fall on our's hat sooner or later
-         */
-        if (!(cur & Transmission::empty))
-          actor->stopEating();
-        qDebug() << "[SceneUpdate] actor moves: color=" << color
-            << "direction=" << direction << "newpos=" << QPoint(x, y);
+          actor->hadReset();
+        }
+        else
+        {
+          /* check for death */
+          if (cur & Transmission::death)
+          {
+            foreach(Color::Color col, colors)
+            {
+              if (color == col)
+                continue;
+              if (m_actors[col]->canEat(actor, m_eatingorder))
+              {
+                m_death[col] = actor;
+                break;
+              }
+            }
+          }
+
+          /* move actor */
+          if (actor->hadReset())
+            actor->setPos(mapPositionToCoord(x, y));
+          else
+            actor->move(mapPositionToCoord(x, y));
+
+          /* that's kind a hack but working right now */
+          if (!(cur & Transmission::empty))
+            actor->stopEating();
+          qDebug() << "[SceneUpdate] actor moves: color=" << color
+              << "newpos=" << QPoint(x, y);
+        }
+
+        if ((cur & Transmission::death) && visualMap[x][y] != NULL)
+            m_death[color] = visualMap[x][y];
       }
-
-
-      if (cur & Transmission::death)
-        m_death[color] = visualMap[x][y];
     }
 
     if (cur & Transmission::empty)