Changeset b1ce08c in network-game for server/server.cpp

Timestamp:

Jul 4, 2014, 8:35:55 PM (10 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

cb5a021

Parents:

dfc81f0 (diff), f15d6a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

File:

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

server/server.cpp

@@ -718 +718 @@
 
          map<unsigned int, Player*>& oldPlayers = g->getPlayers();
-         g->addPlayer(p);
+         g->addPlayer(p, true);
+         p->team = -1;
 
          // send info to other players
@@ -752 +753 @@
          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:
       {