Changeset 7fa452f in network-game for common/Game.cpp

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)

File:

• common/Game.cpp (modified) (2 diffs)

common/Game.cpp

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