From 5c4b6363d5065fb98a53b6981f5a590aaa37829b Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Thu, 2 Oct 2008 14:34:20 +0000
Subject: The "name" property of the map is now used as caption of the minimap
 window when it exists.

(cherry picked from eAthena client, replacing 'mapname' property
handling)
---
 src/engine.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/engine.cpp b/src/engine.cpp
index ba5ce5e3..db1ac3bd 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);
-- 
cgit v1.2.3-70-g09d2