1 files changed, 6 insertions, 17 deletions

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()