Merge branch 'master' of ssh://manuel.mausz.at/foop

1 files changed, 10 insertions, 1 deletions

diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index dace711..37db691 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -73,8 +73,9 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
       }
 
       /* an item must be removed by an actor */
-      if (actor == NULL)
+      if (actor == NULL) {
         Q_ASSERT(false);
+      }
       oldItem->onDie(actor);
 
       /* register item for removal in next update */
@@ -151,6 +152,11 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
         qDebug() << "[SceneUpdate] actor moves: color=" << color
             << "direction=" << direction << "newpos=" << QPoint(x, y);
       }
+
+      QPoint distance = QPoint(x, y) - CoordToMapPosition(actor->pos().x(), actor->pos().y());
+      if (distance.manhattanLength() > 1) {
+        actor->setPos(mapPositionToCoord(x, y));
+      }
     }
 
     if (cur & Transmission::empty)
@@ -195,6 +201,9 @@ unsigned int SceneHolder::pointsLeft()
 void SceneHolder::decrementPoints()
 {
   --m_pointsLeft;
+  if (m_pointsLeft == 0) {
+    emit allPointsRemoved();
+  }
 }
 
 void SceneHolder::setEatingOrder(QList<Color::Color> &order)