Fixed the minimap name field so that it works for us again. Since I

originally ported this from TMW's trunk, and they later changed their
mind on the minimap name property, this was broken on our maps.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index 74e11336..8382f775 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -98,6 +98,10 @@ void Engine::changeMap(const std::string &mapPath)
         {
              minimap->setCaption(newMap->getProperty("mapname"));
         }
+        else if (newMap->hasProperty("name"))
+        {
+            minimap->setCaption(newMap->getProperty("name"));
+        }
         else
         {
              minimap->setCaption("Unknown");
@@ -114,12 +118,6 @@ void Engine::changeMap(const std::string &mapPath)
              minimap->setProportion(0.5);
         }
     }
-    if (newMap->hasProperty("name"))
-    {
-        minimap->setCaption(newMap->getProperty("name"));
-    } else {
-        minimap->setCaption("Map");
-    }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
     particleEngine->setMap(newMap);