more bot stuff

1 files changed, 5 insertions, 5 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index e42cfbc..a48ee32 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -54,6 +54,7 @@ bool Server::run()
 void Server::tick()
 {
   //qDebug() << "[Tick] Doing server update";
+  //TODO: add ai here
   Transmission::map_t map = calculateUpdates();
   updateMap(map);
 
@@ -74,10 +75,6 @@ Transmission::map_t Server::calculateUpdates()
 {
   Transmission::map_t map = Util::createEmptyMap();
 
-  //TODO: ai
-  //m_actorMovements[Color::blue] = Actor::Movement((qrand() % 4) + 1);
-  //m_actorMovements[Color::green] = Actor::Movement((qrand() % 4) + 1);
-
   QMutableMapIterator<Color::Color, Actor::Movement> i(m_actorMovements);
   while (i.hasNext())
   {
@@ -293,7 +290,7 @@ bool Server::waitForClientConnections()
 
   qDebug() << "[Server] Waiting for clients";
   ProtoBuf::Init packet;
-  for (unsigned int i = 0; i < m_maxplayers; ++i)
+  for (unsigned int i = 0; i < (m_maxplayers - m_numbots); ++i)
   {
     bool connectionAvailable = tcpSrv->waitForNewConnection(-1);
     Q_ASSERT(connectionAvailable);
@@ -310,6 +307,9 @@ bool Server::waitForClientConnections()
     qDebug() << "[Connect] New Player: color=" << color;
   }
 
+  for (unsigned int i = (m_maxplayers - m_numbots); i < m_maxplayers; ++i)
+    m_bots.append(Color::order[i]);
+
   qDebug() << "[Server] All Clients connected";
   return true;
 }