Changeset 7fa452f in network-game for server

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:

server

Files:

• DataAccess.cpp (modified) (2 diffs)
• server.cpp (modified) (6 diffs)

server/DataAccess.cpp

@@ -180 +180 @@
    // the columns are result, team, blue score, and red score
    // for result 0 is defeat and 1 is victory
-   // for team, 0 is blue and 1 is red
+   // for team, 1 is blue and 2 is red
 
    MYSQL_RES *result;
@@ -205 +205 @@
 
       if (blueScore == 3) {
-         if (userTeam == 0)
+         if (userTeam == 1)
             gameResult = 1;
          else
             gameResult = 0;
       }else if (redScore == 3) {
-         if (userTeam == 1)
+         if (userTeam == 2)
             gameResult = 1;
          else

server/server.cpp

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