Changeset 48801af in network-game

Timestamp:

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

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

85da778

Parents:

c941e07

Message:

Use an enum for the player's team

Files:

• common/Player.cpp (modified) (2 diffs)
• common/Player.h (modified) (2 diffs)
• server/server.cpp (modified) (5 diffs)

common/Player.cpp

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

common/Player.h

@@ -39 +39 @@
       ATTACK_MELEE,
       ATTACK_RANGED
+   };
+
+   enum PlayerTeam {
+      TEAM_NONE,
+      TEAM_BLUE,
+      TEAM_RED
    };
 
@@ -84 +90 @@
    int range;
    unsigned long long attackCooldown;
-   int team; // 0 is none, 1 is blue, 2 is red
+   PlayerTeam team;
    bool hasBlueFlag;
    bool hasRedFlag;

server/server.cpp

@@ -139 +139 @@
                   switch (p->team)
                   {
-                  case 1:// blue team
+                  case Player::TEAM_BLUE:
                      spawnPos = p->currentGame->getMap()->getStructureLocation(STRUCTURE_BLUE_FLAG);
                      break;
-                  case 2:// red team
+                  case Player::TEAM_RED:
                      spawnPos = p->currentGame->getMap()->getStructureLocation(STRUCTURE_RED_FLAG);
                      break;
@@ -781 +781 @@
          map<unsigned int, Player*>& oldPlayers = g->getPlayers();
          g->addPlayer(p);
-         p->team = 0;
+         p->team = Player::TEAM_NONE;
 
          // send info to other players
@@ -922 +922 @@
          case STRUCTURE_BLUE_FLAG:
          {
-            if (p->team == 1 && p->hasRedFlag) {
+            if (p->team == Player::TEAM_BLUE && p->hasRedFlag) {
                // check that your flag is at your base
                pos = game->getMap()->getStructureLocation(STRUCTURE_BLUE_FLAG);
@@ -951 +951 @@
          case STRUCTURE_RED_FLAG:
          {
-            if (p->team == 2 && p->hasBlueFlag) {
+            if (p->team == Player::TEAM_RED && p->hasBlueFlag) {
                // check that your flag is at your base
                pos = game->getMap()->getStructureLocation(STRUCTURE_RED_FLAG);
@@ -1048 +1048 @@
 
          if (posDistance(p->pos, pos.toFloat()) < 10) {
-            if (p->team == 1 && itObjects->type == OBJECT_BLUE_FLAG) {
+            if (p->team == Player::TEAM_BLUE && itObjects->type == OBJECT_BLUE_FLAG) {
                structPos = game->getMap()->getStructureLocation(STRUCTURE_BLUE_FLAG);
                flagReturned = true;
                break;
-            } else if (p->team == 2 && itObjects->type == OBJECT_RED_FLAG) {
+            } else if (p->team == Player::TEAM_RED && itObjects->type == OBJECT_RED_FLAG) {
                structPos = game->getMap()->getStructureLocation(STRUCTURE_RED_FLAG);
                flagReturned = true;