Changeset df79cfd in network-game

Timestamp:

May 25, 2013, 7:32:50 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

a6066e8

Parents:

b8cb03f

Message:

The server assigns a random team to each player when they login

Files:

• common/Player.cpp (modified) (1 diff)
• server/server.cpp (modified) (1 diff)

common/Player.cpp

@@ -31 +31 @@
    this->target.y = p.target.y;
    this->addr = p.addr;
-      this->team = 0;   // blue team by default
-   this->hasBlueFlag = false;
-   this->hasRedFlag = false;
+   this->team = p.team;
+   this->hasBlueFlag = p.hasBlueFlag;
+   this->hasRedFlag = p.hasRedFlag;
 }
 

server/server.cpp

@@ -305 +305 @@
             serverMsg.type = MSG_TYPE_PLAYER;
 
-            p->setAddr(from);
             updateUnusedId(unusedId, mapPlayers);
             p->id = unusedId;
             cout << "new player id: " << p->id << endl;
+            p->setAddr(from);
+
+            // choose a random team (either 0 or 1)
+            p->team = rand() % 2;
 
             // tell the new player about all the existing players