Changes in / [b1ce08c:dfc81f0] in network-game

File:

• server/server.cpp (modified) (2 diffs)

server/server.cpp

@@ -718 +718 @@
 
          map<unsigned int, Player*>& oldPlayers = g->getPlayers();
-         g->addPlayer(p, true);
-         p->team = -1;
+         g->addPlayer(p);
 
          // send info to other players
@@ -753 +752 @@
          break;
       }
-      case MSG_TYPE_JOIN_TEAM:
-      {
-         cout << "Received a JOIN_TEAM message" << endl;
-
-         Player* p = findPlayerByAddr(mapPlayers, from);
-         map<unsigned int, Player*> players = p->currentGame->getPlayers();
-
-         memcpy(&(p->team), clientMsg.buffer, 4);
-
-         serverMsg.type = MSG_TYPE_PLAYER;
-         p->serialize(serverMsg.buffer);
-         msgProcessor.broadcastMessage(serverMsg, players);
-      }
       default:
       {