Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision d69eb32a44b1ded0917015409956ba84c3771fad)
+++ common/Player.cpp	(revision e76055f16b754e82a6f780b2b726ec75a3ca31b8)
@@ -113,11 +113,7 @@
       }
 
-      //cout << "newPos.x: " << newPos.x << endl;
-      //cout << "newPos.y: " << newPos.y << endl;
-      //cout << "newPos.x/25: " << newPos.x/25 << endl;
-      //cout << "newPos.y/25: " << newPos.y/25 << endl;
-
       switch(map->getElement(newPos.x/25, newPos.y/25)) {
       case WorldMap::TERRAIN_NONE:
+      case WorldMap::TERRAIN_OCEAN:
       case WorldMap::TERRAIN_ROCK:
          cout << "Encountered invalid terrain" << endl;
@@ -132,4 +128,17 @@
          break;
       }
+
+      // using moveCanceled in a hacky way just to indicate that the server
+      // has updated some player info. Should change the variable name
+      switch(map->getObject(newPos.x/25, newPos.y/25)) {
+      case WorldMap::OBJECT_BLUE_FLAG:
+         hasBlueFlag = true;
+         moveCanceled = true;
+         break;
+      case WorldMap::OBJECT_RED_FLAG:
+         hasRedFlag = true;
+         moveCanceled = true;
+         break;
+      }
    }
 
Index: common/WorldMap.h
===================================================================
--- common/WorldMap.h	(revision d69eb32a44b1ded0917015409956ba84c3771fad)
+++ common/WorldMap.h	(revision e76055f16b754e82a6f780b2b726ec75a3ca31b8)
@@ -19,6 +19,6 @@
    enum ObjectType {
       OBJECT_NONE,
-      OBJECT_RED_FLAG,
-      OBJECT_BLUE_FLAG
+      OBJECT_BLUE_FLAG,
+      OBJECT_RED_FLAG
    };
 
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision d69eb32a44b1ded0917015409956ba84c3771fad)
+++ server/server.cpp	(revision e76055f16b754e82a6f780b2b726ec75a3ca31b8)
@@ -122,5 +122,4 @@
       if (timeLastUpdated == 0 || (curTime-timeLastUpdated) >= 50) {
          timeLastUpdated = curTime;
-         //cout << "Server-side player movement: " << timeLastUpdated << endl;
 
          // maybe put this in a separate method