summaryrefslogtreecommitdiff
path: root/src/engine.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-10-02 14:34:20 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-13 17:13:27 +0100
commit5c4b6363d5065fb98a53b6981f5a590aaa37829b (patch)
tree8a236e261afed5e490e970c86b2b60292b71192e /src/engine.cpp
parent76d25a53fad89f43472ebe25ea3a97c664eb8fcd (diff)
downloadmana-5c4b6363d5065fb98a53b6981f5a590aaa37829b.tar.gz
mana-5c4b6363d5065fb98a53b6981f5a590aaa37829b.tar.bz2
mana-5c4b6363d5065fb98a53b6981f5a590aaa37829b.tar.xz
mana-5c4b6363d5065fb98a53b6981f5a590aaa37829b.zip
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)
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp17
1 files 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);