diff options
author | Ira Rice <irarice@gmail.com> | 2008-12-07 19:47:10 -0700 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2008-12-07 19:47:10 -0700 |
commit | 65e00cfe8c9ec876e3fadadac99a6cad0697283d (patch) | |
tree | 660d2f01b6868060dda536d42fa7b19f876b1802 /src/engine.cpp | |
parent | b79e554aec966ef6ef847409c079dd7047264a9e (diff) | |
download | mana-client-65e00cfe8c9ec876e3fadadac99a6cad0697283d.tar.gz mana-client-65e00cfe8c9ec876e3fadadac99a6cad0697283d.tar.bz2 mana-client-65e00cfe8c9ec876e3fadadac99a6cad0697283d.tar.xz mana-client-65e00cfe8c9ec876e3fadadac99a6cad0697283d.zip |
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>
Diffstat (limited to 'src/engine.cpp')
-rw-r--r-- | src/engine.cpp | 10 |
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); |