Merged with 'master'

1 files changed, 7 insertions, 11 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index ba5ce5e3..f191280e 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -89,17 +89,12 @@ 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());
-        }
+    }
+    if (newMap->hasProperty("name"))
+    {
+        minimap->setCaption(newMap->getProperty("name"));
+    } else {
+        minimap->setCaption("Map");
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
@@ -124,6 +119,7 @@ void Engine::changeMap(const std::string &mapPath)
     }
 
     mCurrentMap = newMap;
+    mMapName = mapPath;
 }
 
 void Engine::logic()