4 files changed, 11 insertions, 24 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index f2e1b31..f81961f 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -154,6 +154,7 @@ void MainWidget::tick()
       QList<Color::Color> order;
       for(int i = 0; i < m_updatepacket.eating_order_size(); ++i)
         order.append(static_cast<Color::Color>(m_updatepacket.eating_order(i) & Transmission::color_mask));
+      m_scene->setEatingOrder(order);
     }
 
     Transmission::map_t map = Util::createUninitialisedMap();
diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index feef033..03abf7f 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -72,9 +72,8 @@ 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 */
@@ -200,9 +199,8 @@ unsigned int SceneHolder::pointsLeft()
 void SceneHolder::decrementPoints()
 {
   --m_pointsLeft;
-  if (m_pointsLeft == 0) {
+  if (m_pointsLeft == 0)
     emit allPointsRemoved();
-  }
 }
 
 void SceneHolder::setEatingOrder(QList<Color::Color> &order)
diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index e13682b..f2c0f1c 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -37,14 +37,6 @@ bool Server::run()
   connect(m_tickTimer, SIGNAL(timeout()), this, SLOT(tick()));
   m_tickTimer->start(Constants::tick);
 
-  /* finish round every 3 sec
-  QTimer *timer2 = new QTimer(this);
-  connect(timer2, SIGNAL(timeout()), this, SLOT(onRoundFinished()));
-  timer2->start(3000);
-  // */
-
-  connect(this, SIGNAL(allPointsRemoved()), SLOT(onRoundFinished()));
-
   return true;
 }
 
@@ -492,26 +484,22 @@ void Server::keyPressUpdate()
 
 void Server::onRoundFinished()
 {
-  foreach(Actor *actor, m_actors) {
+  foreach(Actor *actor, m_actors)
     actor->finishRound();
-  }
 
   initRoundMap();
   ++m_curRound;
 
-  if(m_curRound >= m_rounds) {
-    // end of game
+  /* end of game */
+  if(m_curRound >= m_rounds)
     m_tickTimer->stop();
-  }
 }
 
 void Server::initRoundMap(bool firstPacket)
 {
-  disconnect(this, SIGNAL(allPointsRemoved()), this, SLOT(onRoundFinished()));
 
-  // create new map
+  /* create new map */
   Transmission::map_t map =  Util::createDemoMap();
-  // add content
   Util::placeActors(map, m_maxplayers, Color::order);
   Util::fillPoints(map);
 
@@ -532,7 +520,8 @@ void Server::initRoundMap(bool firstPacket)
   Util::deleteMap(map);
   map = NULL;
 
-  connect(this, SIGNAL(allPointsRemoved()), this, SLOT(onRoundFinished()));
+  if (firstPacket)
+    connect(this, SIGNAL(allPointsRemoved()), this, SLOT(onRoundFinished()));
 }
 
 bool Server::parseCommandline()
diff --git a/pacman-c++/util.cpp b/pacman-c++/util.cpp
index 070c716..d83ea3c 100644
--- a/pacman-c++/util.cpp
+++ b/pacman-c++/util.cpp
@@ -144,11 +144,10 @@ namespace Util
       for (unsigned int y = 0; y < Constants::map_size.height; ++y)
       {
         Transmission::field_t &cur = map[x][y];
-        if (cur == Transmission::none) {
+        if (cur == Transmission::none)
           cur = type;
-                                } else if (cur == Transmission::point) {
+        else if (cur == Transmission::point)
           cur = Transmission::none;
-                                }
       }
     }
   }