Index: common/WorldMap.cpp
===================================================================
--- common/WorldMap.cpp	(revision 521c88b9fbbaf5e789f2d4f2cedd46d4d6b31752)
+++ common/WorldMap.cpp	(revision f3cf1a5d1000dbc387a141a75d8586df215c2a89)
@@ -194,5 +194,5 @@
 WorldMap* WorldMap::loadMapFromFile(string filename)
 {
-   WorldMap* m = new WorldMap(12l, 12);
+    WorldMap* m = NULL;
 
    ifstream file(filename.c_str());
@@ -217,4 +217,6 @@
       cout << "width: " << width << endl;
       cout << "height: " << height << endl;
+
+      m = new WorldMap(width, height);
 
       // read the map contents
@@ -284,9 +286,7 @@
                case 1:
                   structure = STRUCTURE_BLUE_FLAG;
-                  cout << "Should have added blue flag object" << endl;
                   break;
                case 2:
                   structure = STRUCTURE_RED_FLAG;
-                  cout << "Should have added red flag object" << endl;
                   break;
                }