Index: server/DataAccess.cpp
===================================================================
--- server/DataAccess.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ server/DataAccess.cpp	(revision 06fc7f78e011d09aa9306419f8a31e5fb549e791)
@@ -177,5 +177,4 @@
 MYSQL_RES *DataAccess::select(string table, string filter)
 {
-   MYSQL_RES *result;
    int query_state;
    ostringstream oss;
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ server/server.cpp	(revision 06fc7f78e011d09aa9306419f8a31e5fb549e791)
@@ -589,18 +589,5 @@
             // add flag objects to the map
             WorldMap* m = g->getMap();
-            for (int y=0; y<m->height; y++) {
-               for (int x=0; x<m->width; x++) {
-                  switch (m->getStructure(x, y)) {
-                     case WorldMap::STRUCTURE_BLUE_FLAG:
-                        m->addObject(WorldMap::OBJECT_BLUE_FLAG, x*25+12, y*25+12);
-                        break;
-                     case WorldMap::STRUCTURE_RED_FLAG:
-                        m->addObject(WorldMap::OBJECT_RED_FLAG, x*25+12, y*25+12);
-                        break;
-                     case WorldMap::STRUCTURE_NONE:
-                        break;
-                  }
-               }
-            }
+            m->createObjectsFromStructures();
 
             serverMsg.type = MSG_TYPE_JOIN_GAME_SUCCESS;