6 files changed, 134 insertions, 28 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index daba1ca..f81961f 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -110,7 +110,7 @@ void MainWidget::updateScore(const ProtoBuf::MapUpdate& packet)
     turnPointsLbl->setText(QString::number(packet.round_points(i)));
 
     QLabel *allPointsLbl = dynamic_cast<QLabel *>(score->itemAtPosition(1, 1)->widget());
-    allPointsLbl->setText(QString::number(packet.round_points(i)));
+    allPointsLbl->setText(QString::number(packet.game_points(i)));
   }
 }
 
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)
diff --git a/pacman-c++/sceneholder.h b/pacman-c++/sceneholder.h
index 69ee598..26ba942 100644
--- a/pacman-c++/sceneholder.h
+++ b/pacman-c++/sceneholder.h
@@ -24,6 +24,9 @@ public:
   void setEatingOrder(QList<Color::Color> &order);
   QList<Color::Color> &eatingOrder();
 
+signals:
+  void allPointsRemoved();
+
 private slots:
   void decrementPoints();
 
diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 07e4c72..1c3caf9 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -11,7 +11,7 @@
 
 Server::Server(QWidget *parent)
   : SceneHolder(parent), m_bindaddress(QHostAddress::Any),
-  m_port(Constants::Networking::port), m_numbots(0)
+  m_port(Constants::Networking::port), m_rounds(3), m_numbots(0), m_curRound(0)
 {
   /* determine max players by using order array */
   for(m_maxplayers = 0; Color::order[m_maxplayers] != Color::none; ++m_maxplayers);
@@ -26,34 +26,25 @@ bool Server::run()
 
   qDebug() << "[Server] Running server...";
   qDebug() << "[Server] Max players:" << m_maxplayers;
+  qDebug() << "[Server] Number of rounds:" << m_rounds;
   qDebug() << "[Server] Number of bots:" << m_numbots;
   if (!waitForClientConnections())
     return false;
 
-  qDebug() << "[Server] Creating map...";
-  Transmission::map_t map =  Util::createDemoMap();
-  Util::placeActors(map, m_maxplayers, Color::order);
-  Util::fillPoints(map);
+  initRoundMap(true);
 
-  /* save positions of blocks for later usage */
-  for (unsigned int x = 0; x < Constants::map_size.width; ++x)
-  {
-    for (unsigned int y = 0; y < Constants::map_size.height; ++y)
-    {
-      Transmission::field_t &cur = map[x][y];
-      if (cur & Transmission::block)
-        m_blocks.append(QPoint(x, y));
-    }
-  }
+  m_tickTimer = new QTimer(this);
+  connect(m_tickTimer, SIGNAL(timeout()), this, SLOT(tick()));
+  m_tickTimer->start(Constants::tick);
 
-  updateMap(map);
-  sendUpdate(map, true);
-  Util::deleteMap(map);
-  map = NULL;
+  /* 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()));
 
-  QTimer *timer = new QTimer(this);
-  connect(timer, SIGNAL(timeout()), this, SLOT(tick()));
-  timer->start(Constants::tick);
   return true;
 }
 
@@ -108,7 +99,6 @@ invalid_direction:
 
     // <t3h g4m3 10gic>
     // TODO: support actors eating each other
-    // TODO: old item - REMOVE THAT?
     GameEntity *oldItem = visualMap[mapPosition.x()][mapPosition.y()];
 
     /* check if there's an item at new location of actor */
@@ -500,6 +490,81 @@ void Server::keyPressUpdate()
   }
 }
 
+void Server::onRoundFinished()
+{
+  foreach(Actor *actor, m_actors) {
+    actor->finishRound();
+  }
+
+  initRoundMap();
+  ++m_curRound;
+
+  if(m_curRound >= m_rounds) {
+    // end of game
+    m_tickTimer->stop();
+  }
+}
+
+void Server::initRoundMap(bool firstPacket)
+{
+  disconnect(this, SIGNAL(allPointsRemoved()), this, SLOT(onRoundFinished()));
+  if (!firstPacket) {
+    // clear old map
+    for (unsigned int i=0; i<visualMap.size(); ++i) {
+      for (unsigned int j=0; j<visualMap[0].size(); ++j) {
+        GameEntity *e = visualMap[i][j];
+        if (e != NULL) {
+          if (qgraphicsitem_cast<Actor *>(e) == NULL) {
+            removeItem(e);
+            delete e;
+          }
+        }
+        visualMap[i][j] = 0;
+      }
+    }
+  }
+
+  // create new map
+  Transmission::map_t map =  Util::createDemoMap();
+  // add content
+  Util::placeActors(map, m_maxplayers, Color::order);
+  /*
+  if (!firstPacket) {
+    for (unsigned int i=0; i<Constants::map_size.width; ++i) {
+      for (unsigned int j=0; j<Constants::map_size.height; ++j) {
+        if (map[i][j] & Transmission::pacman) {
+          Color::Color color = static_cast<Color::Color>(map[i][j] & Transmission::color_mask);
+          Actor *actor = m_actors.value(color, NULL);
+          qDebug() << "setting actor to " << i << j << mapPositionToCoord(i, j);
+          actor->setPos(mapPositionToCoord(i, j));
+        }
+      }
+    }
+  }
+  */
+
+  Util::fillPoints(map);
+
+  /* save positions of blocks for later usage */
+  m_blocks.clear();
+  for (unsigned int x = 0; x < Constants::map_size.width; ++x)
+  {
+    for (unsigned int y = 0; y < Constants::map_size.height; ++y)
+    {
+      Transmission::field_t &cur = map[x][y];
+      if (cur & Transmission::block)
+        m_blocks.append(QPoint(x, y));
+    }
+  }
+
+  updateMap(map);
+  sendUpdate(map, firstPacket);
+  Util::deleteMap(map);
+  map = NULL;
+
+  connect(this, SIGNAL(allPointsRemoved()), this, SLOT(onRoundFinished()));
+}
+
 bool Server::parseCommandline()
 {
   AnyOption opt;
@@ -535,6 +600,10 @@ bool Server::parseCommandline()
   out << "  --nocolorblocks" << endl
       << "  Disable random colorized blocks" << endl
       << endl;
+  opt.setOption("rounds", 'r');
+  out << "  -r, --rounds [1..n]" << endl
+      << "  Number of rounds to play" << endl
+      << endl;
   opt.setFlag("nocolorblocks");
   out << "  -h, --help" << endl
       << "  Prints this help message" << endl;
@@ -603,6 +672,18 @@ bool Server::parseCommandline()
     m_numbots = numbots;
   }
 
+  if (opt.getValue("rounds") != NULL)
+  {
+    bool ok;
+    unsigned int rounds = QString(opt.getValue("rounds")).toUInt(&ok);
+    if (!ok || rounds == 0)
+    {
+      qCritical() << "Invalid number of rounds: " << opt.getValue("rounds") << endl;
+      return false;
+    }
+    m_rounds = rounds;
+  }
+
   this->setProperty("coloredblocks", !opt.getFlag("nocolorblocks"));
 
   return true;
diff --git a/pacman-c++/server.h b/pacman-c++/server.h
index 826c701..dc8de88 100644
--- a/pacman-c++/server.h
+++ b/pacman-c++/server.h
@@ -38,6 +38,12 @@ protected:
   void colorizeBlocks(Transmission::map_t map);
   void botCalculate(Actor *actor);
 
+protected slots:
+  // TODO: call this when a pacman get's eaten
+  void onRoundFinished(); // called when a round is finished
+protected:
+  void initRoundMap(bool firstPacket = false); // creates new round map
+
 protected:
   QMap<Color::Color, QTcpSocket *> m_clientConnections;
   QList<Color::Color> m_bots;
@@ -56,7 +62,13 @@ protected:
   QHostAddress m_bindaddress;
   unsigned int m_port;
   unsigned int m_maxplayers;
+  unsigned int m_rounds; // number of rounds (>= 1)
   unsigned int m_numbots;
+
+  unsigned int m_curRound; // current round starting with 0
+
+  QTimer *m_tickTimer;
+
 };
 
 #endif // SERVER_H
diff --git a/pacman-c++/util.cpp b/pacman-c++/util.cpp
index 708d005..070c716 100644
--- a/pacman-c++/util.cpp
+++ b/pacman-c++/util.cpp
@@ -90,7 +90,7 @@ namespace Util
     QList<QPoint> actors;
     for(unsigned int i = 0; i < players; ++i)
     {
-      /* first remove formally placed actors from map */
+      /* first remove formerly placed actors from map */
       foreach(QPoint pos, actors)
         map[pos.x()][pos.y()] = Transmission::none;
       actors.clear();
@@ -144,10 +144,11 @@ 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;
+                                }
       }
     }
   }