1 files changed, 49 insertions, 28 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index c83c70d..144043b 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -13,7 +13,7 @@ Server::Server(QWidget *parent)
   waitForClientConnections();
   qDebug() << "clients connected";
 
-  updateMap(Util::createDummyMap());
+  updateMap(Util::createDemoMap());
 
   QTimer *timer = new QTimer(this);
   connect(timer, SIGNAL(timeout()), this, SLOT(tick()));
@@ -35,33 +35,51 @@ Transmission::map_t Server::calculateUpdates()
   Transmission::map_t map = Util::createEmptyMap();
 
   QMapIterator<Color::Color, Actor::Movement> i(m_actorMovements);
-  while (i.hasNext()) {
+  while (i.hasNext())
+  {
     i.next();
-    Actor *actor = m_actors.value( i.key() );
-    QPoint mapPosition = CoordToMapPosition(actor->x(), actor->y());
+    Actor *actor = m_actors.value(i.key());
+    QPoint mapPosition = actor->pos().toPoint();
+    mapPosition = CoordToMapPosition(actor->pos().toPoint());
     qDebug() << "actor " << i.key() << " is at " << mapPosition;
 
     QPoint newMapPosition = mapPosition;
-    switch (i.value()) {
-      case Actor::Up: newMapPosition += QPoint(0, -1); break;
-      case Actor::Down: newMapPosition += QPoint(0, 1); break;
-      case Actor::Left: newMapPosition += QPoint(-1, 0); break;
-      case Actor::Right: newMapPosition += QPoint(1, 0); break;
-      case Actor::None: break;
-      default: Q_ASSERT(false);
+    switch (i.value())
+    {
+    case Actor::Up:
+      newMapPosition += QPoint(0, -1);
+      break;
+    case Actor::Down:
+      newMapPosition += QPoint(0, 1);
+      break;
+    case Actor::Left:
+      newMapPosition += QPoint(-1, 0);
+      break;
+    case Actor::Right:
+      newMapPosition += QPoint(1, 0);
+      break;
+    case Actor::None:
+      break;
+    default:
+      Q_ASSERT(false);
     }
-    if (newMapPosition.x() < 0) newMapPosition.setX(0);
-    if (newMapPosition.x() >= visualMap.size()) newMapPosition.setX(visualMap.size()-1);
-    if (newMapPosition.y() < 0) newMapPosition.setY(0);
-    if (newMapPosition.y() >= visualMap[newMapPosition.x()].size()) newMapPosition.setY(visualMap[newMapPosition.x()].size()-1);
+
+    if (newMapPosition.x() < 0)
+      newMapPosition.setX(0);
+    if (newMapPosition.x() >= visualMap.size())
+      newMapPosition.setX(visualMap.size() - 1);
+    if (newMapPosition.y() < 0)
+      newMapPosition.setY(0);
+    if (newMapPosition.y() >= visualMap[newMapPosition.x()].size())
+      newMapPosition.setY(visualMap[newMapPosition.x()].size() - 1);
 
     // <t3h g4m3 10gic>
-    if(dynamic_cast<Block*>(visualMap[newMapPosition.x()][newMapPosition.y()]) != 0) {
+    if(dynamic_cast<Block*>(visualMap[newMapPosition.x()][newMapPosition.y()]) != 0)
       continue;
-    }
     // </t3h g4m2 10gic>
 
-    if (mapPosition != newMapPosition) {
+    if (mapPosition != newMapPosition)
+    {
       map[mapPosition.x()][mapPosition.y()] = Transmission::empty;
       map[newMapPosition.x()][newMapPosition.y()] =
         Transmission::pacman | i.key() |
@@ -76,10 +94,10 @@ QSharedPointer< ProtoBuf::MapUpdate > Server::createUpdatePacket(Transmission::m
   QSharedPointer<ProtoBuf::MapUpdate> updatePacket =
     QSharedPointer<ProtoBuf::MapUpdate>(new ProtoBuf::MapUpdate);
 
-  for (unsigned int x = 0; x < Constants::map_size.width; ++x) {
-   for (unsigned int y = 0; y < Constants::map_size.height; ++y) {
+  for (unsigned int x = 0; x < Constants::map_size.width; ++x)
+  {
+   for (unsigned int y = 0; y < Constants::map_size.height; ++y)
       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());
@@ -101,9 +119,11 @@ void Server::waitForClientConnections()
 
   Color::Color playerColors[3] = { Color::red, Color::blue, Color::green };
 #ifdef SINGLE
-  for (unsigned int i=0; i<1; ++i) {
+  for (unsigned int i=0; i < 1; ++i)
+  {
 #else
-  for (unsigned int i=0; i<Color::max; ++i) {
+  for (unsigned int i=0; i < Color::max; ++i)
+  {
 #endif
     bool connectionAvailable = tcpSrv->waitForNewConnection(-1);
     Q_ASSERT(connectionAvailable);
@@ -124,21 +144,22 @@ void Server::sendUpdate(QSharedPointer< ProtoBuf::MapUpdate > packet)
 {
   std::string dataStr = packet->SerializeAsString();
   const char *data = dataStr.c_str();
-  foreach(QTcpSocket *socket, m_clientConnections) {
+  foreach(QTcpSocket *socket, m_clientConnections)
     Util::sendPacket(data, dataStr.length(), socket);
-  }
 }
 
 void Server::keyPressUpdate()
 {
   qDebug() << "kpress";
   QMapIterator<Color::Color, QTcpSocket*> i(m_clientConnections);
-  while (i.hasNext()) {
+  while (i.hasNext())
+  {
     i.next();
     Color::Color color = i.key();
     QTcpSocket *socket = i.value();
     qDebug() << "data?";
-    if (socket->bytesAvailable() > 0) {
+    if (socket->bytesAvailable() > 0)
+    {
       qDebug() << "data!";
       std::string dataStr;
       Util::QByteArrayToStdString(socket->readAll(), dataStr);
@@ -146,7 +167,7 @@ void Server::keyPressUpdate()
       packet.ParseFromString(dataStr);
       Transmission::field_t direction = packet.newkey();
       qDebug() << "data:" << direction;
-      m_actorMovements[ color ] = Util::transmissionMovementToActor(direction);
+      m_actorMovements[color] = Util::transmissionMovementToActor(direction);
     }
   }
 }