Merged the Tametomo branch into trunk.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index d1912b0d..42054ffb 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -96,6 +96,17 @@ void Engine::changeMap(const std::string &mapPath)
     if (newMap->hasProperty("minimap"))
     {
         mapImage = resman->getImage(newMap->getProperty("minimap"));
+
+        // Set the title for the Minimap
+        if (newMap->hasProperty("mapname"))
+        {
+             minimap->setCaption(newMap->getProperty("mapname"));
+        }
+        else
+        {
+             minimap->setCaption("Unknown");
+             logger->log("WARNING: Map file '%s' defines a minimap image but does not define a 'mapname' property", map_path.c_str());
+        }
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
@@ -120,6 +131,7 @@ void Engine::changeMap(const std::string &mapPath)
     }
 
     mCurrentMap = newMap;
+    mMapName = mapPath;
 
     // Send "map loaded"
     MessageOut outMsg(mNetwork);