Changeset 306758e in network-game

Timestamp:

Nov 8, 2014, 1:13:40 AM (10 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

7fa452f

Parents:

f3dfead

Message:

Remove the serverSide argument from Game::addPlayer() since it's no longer useful

Files:

• client/Client/main.cpp (modified) (1 diff)
• common/Game.cpp (modified) (2 diffs)
• common/Game.h (modified) (1 diff)
• server/server.cpp (modified) (1 diff)

client/Client/main.cpp

@@ -1098 +1098 @@
                   mapPlayers[p.getId()] = new Player(p);
 
-               game->addPlayer(mapPlayers[p.getId()], false);
+               game->addPlayer(mapPlayers[p.getId()]);
 
                break;

common/Game.cpp

@@ -43 +43 @@
 }
 
-bool Game::addPlayer(Player* p, bool serverSide) {
+bool Game::addPlayer(Player* p) {
    if (players.find(p->getId()) == players.end()) {
       players[p->getId()] = p;
@@ -57 +57 @@
       p->hasBlueFlag = false;
       p->hasRedFlag = false;
-
-      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 serverSide);
+   bool addPlayer(Player* p);
    bool removePlayer(unsigned int id);
 

server/server.cpp

@@ -779 +779 @@
 
          map<unsigned int, Player*>& oldPlayers = g->getPlayers();
-         g->addPlayer(p, true);
+         g->addPlayer(p);
          p->team = -1;