Changeset 7fa452f in network-game for client/Client

Timestamp:

Nov 8, 2014, 1:38:54 AM (10 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

347d768

Parents:

306758e

Message:

Change the player team variable so that 0 means no team, 1 means blue team, and 2 means red team (before, -1 meant no team, 0 meant blue team, and 1 meant red team)

Location:

client/Client

Files:

• GameRender.cpp (modified) (1 diff)
• main.cpp (modified) (4 diffs)

client/Client/GameRender.cpp

@@ -96 +96 @@
          al_draw_filled_circle(pos.x, pos.y, 14, al_map_rgb(0, 0, 0));
       
-      if (p->team == 0)
+      if (p->team == 1)
          color = al_map_rgb(0, 0, 255);
-      else if (p->team == 1)
+      else if (p->team == 2)
          color = al_map_rgb(255, 0, 0);
       else {

client/Client/main.cpp

@@ -505 +505 @@
             for (itPlayers = gamePlayers.begin(); itPlayers != gamePlayers.end(); itPlayers++) {
                switch (itPlayers->second->team) {
-               case -1:
+               case 0:
                   drawPosition = 200;
                   break;
-               case 0:
+               case 1:
                   drawPosition = 400;
                   break;
-               case 1:
+               case 2:
                   drawPosition = 600;
                   break;
@@ -1514 +1514 @@
 void joinWaitingArea() {
    cout << "joining waiting area" << endl;
-   currentPlayer->team = -1;
+   currentPlayer->team = 0;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1524 +1524 @@
 void joinBlueTeam() {
    cout << "joining blue team" << endl;
-   currentPlayer->team = 0;
+   currentPlayer->team = 1;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1534 +1534 @@
 void joinRedTeam() {
    cout << "joining red team" << endl;
-   currentPlayer->team = 1;
+   currentPlayer->team = 2;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;