Changeset 85da778 in network-game

Timestamp:

Nov 11, 2014, 1:26:14 AM (10 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

6ba31d2

Parents:

48801af

Message:

Convert the client to use the PlayerTeam enum

Files:

• client/Client/GameRender.cpp (modified) (1 diff)
• client/Client/main.cpp (modified) (3 diffs)
• common/Game.cpp (modified) (2 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 == 1)
+      if (p->team == Player::TEAM_BLUE)
          color = al_map_rgb(0, 0, 255);
-      else if (p->team == 2)
+      else if (p->team == Player::TEAM_RED)
          color = al_map_rgb(255, 0, 0);
       else {

client/Client/main.cpp

@@ -1546 +1546 @@
 void joinWaitingArea() {
    cout << "joining waiting area" << endl;
-   currentPlayer->team = 0;
+   currentPlayer->team = Player::TEAM_NONE;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1556 +1556 @@
 void joinBlueTeam() {
    cout << "joining blue team" << endl;
-   currentPlayer->team = 1;
+   currentPlayer->team = Player::TEAM_BLUE;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1566 +1566 @@
 void joinRedTeam() {
    cout << "joining red team" << endl;
-   currentPlayer->team = 2;
+   currentPlayer->team = Player::TEAM_RED;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;

common/Game.cpp

@@ -184 +184 @@
          switch (it->type) {
             case OBJECT_BLUE_FLAG:
-               if (p->team == 2) {
+               if (p->team == Player::TEAM_RED) {
                   p->hasBlueFlag = true;
                   itemId = it->id;
@@ -190 +190 @@
                break;
             case OBJECT_RED_FLAG:
-               if (p->team == 1) {
+               if (p->team == Player::TEAM_BLUE) {
                   p->hasRedFlag = true;
                   itemId = it->id;