Changeset ea17281 in network-game for common

Timestamp:

Jul 4, 2014, 8:09:47 PM (10 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

e98426d

Parents:

a0ce8a3

Message:

Game.addPlayer takes a boolean to indicate wheter it runs on the server. If it's not, the team isn't randomly generated.

Location:

common

Files:

• Game.cpp (modified) (2 diffs)
• Game.h (modified) (1 diff)
• MessageProcessor.cpp (modified) (1 diff)

common/Game.cpp

@@ -43 +43 @@
 }
 
-bool Game::addPlayer(Player* p) {
+bool Game::addPlayer(Player* p, bool serverSide) {
    if (players.find(p->getId()) == players.end()) {
       players[p->getId()] = p;
@@ -58 +58 @@
       p->hasRedFlag = false;
 
-      // choose a random team (either 0 or 1)
-      p->team = rand() % 2;
+      if (serverSide) {
+         // choose a random team (either 0 or 1)
+         p->team = rand() % 2;
+      }
 
       p->currentGame = this;

common/Game.h

@@ -49 +49 @@
 
    map<unsigned int, Player*>& getPlayers();
-   bool addPlayer(Player* p);
+   bool addPlayer(Player* p, bool serverSide);
    bool removePlayer(unsigned int id);
 

common/MessageProcessor.cpp

@@ -50 +50 @@
 
    // assume we don't care about the value of socklen
-   cout << "Waiting for message from server" << endl;
+   //cout << "Waiting for message from server" << endl;
    int ret =  recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)source, &socklen);
-   cout << "Returned from wait" << endl;
+   //cout << "Returned from wait" << endl;
 
    if (ret == -1)