Changeset 0678d60 in network-game for common/Game.cpp

Timestamp:

Jan 22, 2014, 1:31:27 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

06fc7f7

Parents:

204edcf

Message:

All server warnings have been fixed and the WorldMap class has a new method to create flags (and, in the future, other objects) based on structures present on the map

File:

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

common/Game.cpp

@@ -162 +162 @@
    vector<WorldMap::Object>* vctObjects = this->worldMap->getObjects();
    vector<WorldMap::Object>::iterator it;
-   int playerId = -1;
+   int itemId = -1;
 
    for (it = vctObjects->begin(); it != vctObjects->end(); it++) {
@@ -170 +170 @@
                if (p->team == 1) {
                   p->hasBlueFlag = true;
-                  playerId = it->id;
+                  itemId = it->id;
                }
                break;
@@ -176 +176 @@
                if (p->team == 0) {
                   p->hasRedFlag = true;
-                  playerId = it->id;
+                  itemId = it->id;
                }
                break;
-         }
-
-         if (playerId > -1) {
+            case WorldMap::OBJECT_NONE:
+               break;
+         }
+
+         if (itemId > -1) {
             vctObjects->erase(it);
-            return playerId;
-         }
-      }
-   }
-
-   return playerId;
+            return itemId;
+         }
+      }
+   }
+
+   return itemId;
 }
 
@@ -214 +216 @@
 
 bool Game::handleGameEvents() {
-   NETWORK_MSG serverMsg;
    map<unsigned int, Player*>::iterator it;
    bool gameFinished = false;
@@ -325 +326 @@
             }
 
+            break;
+         }
+         default:
+         {
             break;
          }