Added on-the-fly map loading.

3 files changed, 20 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 117de309..e6ab7d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
 	src/player.h, src/game-server/gamehandler.cpp, src/Makefile.am:
 	Embedded a simplified version of GameClient into GameHandler. Removed
 	the original files.
+	* src/game-server/mapmanager.hpp, src/game-server/mapmanager.cpp: Added
+	on-the-fly map loading.
 
 2006-12-29  Guillaume Melquiond <guillaume.melquiond@gmail.com>
 
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp
index 3b2caedf..6ba7464b 100644
--- a/src/game-server/mapmanager.cpp
+++ b/src/game-server/mapmanager.cpp
@@ -70,8 +70,11 @@ MapManager::MapManager(std::string const &mapReferenceFile)
 
         unsigned id = XML::getProperty(node, "id", 0);
         std::string name = XML::getProperty(node, "name", std::string());
-        // TODO: load only local maps
-        loadMap(id, name);
+        if (id != 0 && !name.empty())
+        {
+            LoadedMap m = { name, NULL };
+            maps[id] = m;
+        }
     }
 
     xmlFreeDoc(doc);
@@ -85,23 +88,23 @@ MapManager::~MapManager()
     }
 }
 
-void MapManager::loadMap(unsigned mapId, std::string const &mapFile)
-{
-    LoadedMap m = { mapFile, MapReader::readMap("maps/" + mapFile) };
-    if (m.map == NULL)
-    {
-        LOG_ERROR("Unable to load map \"" << mapFile << "\" (id " << mapId << ")", 0);
-        return;
-    }
-    LOG_INFO("Loaded map \"" << mapFile << "\" (id " << mapId << ")", 0);
-    maps[mapId] = m;
-}
-
 Map *MapManager::getMap(unsigned mapId)
 {
     Maps::iterator i = maps.find(mapId);
     assert(i != maps.end());
-    return i->second.map;
+    Map *&map = i->second.map;
+    if (!map)
+    {
+        std::string const &file = i->second.fileName;
+        map = MapReader::readMap("maps/" + file);
+        if (!map)
+        {
+            LOG_ERROR("Unable to load map \"" << file << "\" (id " << mapId << ")", 0);
+            return NULL;
+        }
+        LOG_INFO("Loaded map \"" << file << "\" (id " << mapId << ")", 0);
+    }
+    return map;
 }
 
 std::string MapManager::getMapName(unsigned mapId)
diff --git a/src/game-server/mapmanager.hpp b/src/game-server/mapmanager.hpp
index 1090a850..7ac3970b 100644
--- a/src/game-server/mapmanager.hpp
+++ b/src/game-server/mapmanager.hpp
@@ -69,12 +69,6 @@ class MapManager
         ~MapManager();
 
     private:
-        /**
-         * Loads the specified map.
-         */
-        void loadMap(unsigned, std::string const &);
-
-        // Hold all the loaded maps.
         Maps maps;
 };