Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision bcfd99a8a3361faeb26c80c998ea2cac7caa7a63)
+++ server/server.cpp	(revision 2e63b644d7d876674a2522c3ffba59c328a3ac4b)
@@ -44,5 +44,5 @@
 // from used to be const. Removed that so I could take a reference
 // and use it to send messages
-void processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, MessageProcessor& msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, WorldMap* gameMap, unsigned int& unusedPlayerId);
+void processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, MessageProcessor& msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, unsigned int& unusedPlayerId);
 
 bool handleGameEvents(Game* game, map<unsigned int, Player*>& mapPlayers, MessageProcessor& msgPocessor);
@@ -90,24 +90,4 @@
    outputLog.open("server.log", ios::app);
    outputLog << "Started server on " << getCurrentDateTimeString() << endl;
-
-   WorldMap* gameMap = WorldMap::loadMapFromFile("../data/map.txt");
-
-   // add some items to the map. They will be sent out
-   // to players when they login
-   for (int y=0; y<gameMap->height; y++)
-   {
-      for (int x=0; x<gameMap->width; x++)
-      {
-         switch (gameMap->getStructure(x, y))
-         {
-            case WorldMap::STRUCTURE_BLUE_FLAG:
-               gameMap->addObject(WorldMap::OBJECT_BLUE_FLAG, x*25+12, y*25+12);
-               break;
-            case WorldMap::STRUCTURE_RED_FLAG:
-               gameMap->addObject(WorldMap::OBJECT_RED_FLAG, x*25+12, y*25+12);
-               break;
-         }
-      }
-   }
 
    sock = socket(AF_INET, SOCK_DGRAM, 0);
@@ -212,5 +192,4 @@
          map<string, Game*>::iterator itGames;
          Game* game = NULL;
-         WorldMap* gameMap = NULL;
 
          for (itGames = mapGames.begin(); itGames != mapGames.end();) { 
@@ -268,5 +247,5 @@
       if (msgProcessor.receiveMessage(&clientMsg, &from) >= 0)
       {
-         processMessage(clientMsg, from, msgProcessor, mapPlayers, mapGames, gameMap, unusedPlayerId);
+         processMessage(clientMsg, from, msgProcessor, mapPlayers, mapGames, unusedPlayerId);
 
          cout << "Finished processing the message" << endl;
@@ -293,5 +272,5 @@
 }
 
-void processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, WorldMap* gameMap, unsigned int& unusedPlayerId)
+void processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, unsigned int& unusedPlayerId)
 {
    NETWORK_MSG serverMsg;