Changeset 7fa452f in network-game for common

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:

common

Files:

• Game.cpp (modified) (2 diffs)
• Player.cpp (modified) (2 diffs)
• Player.h (modified) (1 diff)

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;

common/Player.cpp

@@ -30 +30 @@
    this->range = 0;
    this->attackCooldown = 0;
-   this->team = 0;   // blue team by default
+   this->team = 0;   // no team by default
    this->hasBlueFlag = false;
    this->hasRedFlag = false;
@@ -104 +104 @@
    this->range = 0;
    this->attackCooldown = 0;
-   this->team = 0;   // blue team by default
+   this->team = 0;   // no team by default
    this->hasBlueFlag = false;
    this->hasRedFlag = false;

common/Player.h

@@ -84 +84 @@
    int range;
    unsigned long long attackCooldown;
-   int team; // 0 is blue, 1 is red
+   int team; // 0 is none, 1 is blue, 2 is red
    bool hasBlueFlag;
    bool hasRedFlag;