1 files changed, 17 insertions, 3 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 7e467e5..0a84561 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -52,8 +52,11 @@ Transmission::map_t Server::calculateUpdates()
     }
 
     // <t3h g4m3 10gic>
-    if(dynamic_cast<Block*>(visualMap[newMapPosition.x()][newMapPosition.y()]) != 0) {
-      continue;
+    if (0 <= newMapPosition.x() && newMapPosition.x() < visualMap.size() &&
+      0 <= newMapPosition.y() && newMapPosition.y() < visualMap[newMapPosition.x()].size()) {
+      if(dynamic_cast<Block*>(visualMap[newMapPosition.x()][newMapPosition.y()]) != 0) {
+        continue;
+      }
     }
     // </t3h g4m2 10gic>
 
@@ -75,6 +78,12 @@ QSharedPointer< ProtoBuf::MapUpdate > Server::createUpdatePacket(Transmission::m
       updatePacket->add_field(map[x][y]);
     }
   }
+  updatePacket->set_round_points_red(m_actors.value(Color::red)->getRoundPoints());
+  updatePacket->set_game_points_red(m_actors.value(Color::red)->getGamePoints());
+  updatePacket->set_round_points_green(m_actors.value(Color::green)->getRoundPoints());
+  updatePacket->set_game_points_green(m_actors.value(Color::green)->getGamePoints());
+  updatePacket->set_round_points_blue(m_actors.value(Color::blue)->getRoundPoints());
+  updatePacket->set_game_points_blue(m_actors.value(Color::blue)->getGamePoints());
   //qDebug() << "field sz "<< updatePacket->field_size();
   return updatePacket;
 }
@@ -85,9 +94,14 @@ void Server::waitForClientConnections()
   // server must stay alive as long as sockets (qt parent mem mechanism)
   tcpSrv->listen(QHostAddress::Any, Constants::port);
 
+#define SINGLE
+
   Color::Color playerColors[3] = { Color::red, Color::blue, Color::green };
-  //for (unsigned int i=0; i<Color::max; ++i) {
+#ifdef SINGLE
   for (unsigned int i=0; i<1; ++i) {
+#else
+  for (unsigned int i=0; i<Color::max; ++i) {
+#endif
     bool connectionAvailable = tcpSrv->waitForNewConnection(-1);
     Q_ASSERT(connectionAvailable);
     QTcpSocket *socket =  tcpSrv->nextPendingConnection();