Changeset 7f884ea in network-game for server/server.cpp

Timestamp:

Jan 24, 2014, 12:27:15 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

f66d04f

Parents:

e70b66b

Message:

Map-related structs are now outside of the WorldMap class

File:

• server/server.cpp (modified) (3 diffs)

server/server.cpp

@@ -141 +141 @@
                   {
                   case 0:// blue team
-                     spawnPos = p->currentGame->getMap()->getStructureLocation(WorldMap::STRUCTURE_BLUE_FLAG);
+                     spawnPos = p->currentGame->getMap()->getStructureLocation(STRUCTURE_BLUE_FLAG);
                      break;
                   case 1:// red team
-                     spawnPos = p->currentGame->getMap()->getStructureLocation(WorldMap::STRUCTURE_RED_FLAG);
+                     spawnPos = p->currentGame->getMap()->getStructureLocation(STRUCTURE_RED_FLAG);
                      break;
                   default:
@@ -529 +529 @@
          Player* p = mapPlayers[id];
 
-         WorldMap::ObjectType flagType = WorldMap::OBJECT_NONE;
+         ObjectType flagType = OBJECT_NONE;
          if (p->hasBlueFlag)
-            flagType = WorldMap::OBJECT_BLUE_FLAG;
+            flagType = OBJECT_BLUE_FLAG;
          else if (p->hasRedFlag)
-            flagType = WorldMap::OBJECT_RED_FLAG;
+            flagType = OBJECT_RED_FLAG;
 
          map<unsigned int, Player*> players = p->currentGame->getPlayers();
@@ -644 +644 @@
 
             if (!p->isDead) {
-               WorldMap::ObjectType flagType = WorldMap::OBJECT_NONE;
+               ObjectType flagType = OBJECT_NONE;
                if (p->hasBlueFlag)
-                  flagType = WorldMap::OBJECT_BLUE_FLAG;
+                  flagType = OBJECT_BLUE_FLAG;
                else if (p->hasRedFlag)
-                  flagType = WorldMap::OBJECT_RED_FLAG;
-
-               if (flagType != WorldMap::OBJECT_NONE)
+                  flagType = OBJECT_RED_FLAG;
+
+               if (flagType != OBJECT_NONE)
                   g->addObjectToMap(flagType, p->pos.x, p->pos.y);
             }