summaryrefslogtreecommitdiff
path: root/src/engine.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-09-25 00:15:44 +0000
committerIra Rice <irarice@gmail.com>2008-09-25 00:15:44 +0000
commit489a429bea6739dfa25503b9329bd9e33bffb856 (patch)
tree8112f6fd988fdc0610329b6bc14ee3f9d5801092 /src/engine.cpp
parent2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 (diff)
downloadmana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.gz
mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.bz2
mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.xz
mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.zip
Merged the Tametomo branch into trunk.
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index d1912b0d..42054ffb 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -96,6 +96,17 @@ 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());
+ }
}
minimap->setMapImage(mapImage);
beingManager->setMap(newMap);
@@ -120,6 +131,7 @@ void Engine::changeMap(const std::string &mapPath)
}
mCurrentMap = newMap;
+ mMapName = mapPath;
// Send "map loaded"
MessageOut outMsg(mNetwork);