Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 45096488194fc2febd193d3374cb66b22569660b)
+++ server/server.cpp	(revision 70fc3e8c64627860a5f0a40e73b45bc85bd3da6d)
@@ -990,4 +990,19 @@
          mapGames[gameName] = g;
 
+         // 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;
+               }
+            }
+         }
+
          Player* p = findPlayerByAddr(mapPlayers, from);
          p->currentGame = g;