summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-13 21:23:33 +0200
committerAndrei Karas <akaras@inbox.ru>2011-03-13 21:59:10 +0200
commitbf32ca896ccf51385eb67812088ba5861ca2ede2 (patch)
tree02cc6a7f8de3ef48b6092668368f3b5ba8f35683 /src/gui
parent774e86e8d2f8d787fb3b3a865cd500f166153c96 (diff)
downloadmanaverse-bf32ca896ccf51385eb67812088ba5861ca2ede2.tar.gz
manaverse-bf32ca896ccf51385eb67812088ba5861ca2ede2.tar.bz2
manaverse-bf32ca896ccf51385eb67812088ba5861ca2ede2.tar.xz
manaverse-bf32ca896ccf51385eb67812088ba5861ca2ede2.zip
Add ability to remap maps to different files.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/debugwindow.cpp2
-rw-r--r--src/gui/killstats.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 7707c0935..1b436a617 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -184,7 +184,7 @@ void DebugWindow::logic()
mMinimapLabel->setCaption(strprintf("%s %s", _("Minimap:"),
map->getProperty("minimap").c_str()));
mMapLabel->setCaption(strprintf("%s %s", _("Map:"),
- map->getProperty("_filename").c_str()));
+ map->getProperty("_realfilename").c_str()));
if (mUpdateTime != cur_time)
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 8ce38c719..9bbbc8549 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -385,8 +385,8 @@ void KillStats::validateJacko()
Map *currentMap = Game::instance()->getCurrentMap();
if (currentMap)
{
- if (currentMap->getProperty("_filename") == "018-1"
- || currentMap->getProperty("_filename") == "maps/018-1.tmx")
+ if (currentMap->getProperty("_realfilename") == "018-1"
+ || currentMap->getProperty("_realfilename") == "maps/018-1.tmx")
{
if (player_node->getTileX() >= 167
&& player_node->getTileX() <= 175