diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-07-09 11:49:46 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-07-09 11:49:46 +0300 |
commit | 6e052536a2dfb7f877a356477bc86c904aae1e71 (patch) | |
tree | cfe31d967d591a99609eea758bb2823769ab9edb /src/being | |
parent | acb8d0c088c2d4368b73b3c1c1d7eb13bad49aa0 (diff) | |
download | mv-6e052536a2dfb7f877a356477bc86c904aae1e71.tar.gz mv-6e052536a2dfb7f877a356477bc86c904aae1e71.tar.bz2 mv-6e052536a2dfb7f877a356477bc86c904aae1e71.tar.xz mv-6e052536a2dfb7f877a356477bc86c904aae1e71.zip |
Add empty map mode without collisions.
Mode can be switched from yellow bar.
Also renamed map draw type related variables and methods.
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/localplayer.cpp | 18 | ||||
-rw-r--r-- | src/being/localplayer.h | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 52bf2d75d..c069a6e4e 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -1520,7 +1520,7 @@ std::string LocalPlayer::getPickUpTypeString() mPickUpType, pickUpTypeSize)); } -const unsigned debugPathSize = 5; +const unsigned debugPathSize = 7; static const char *const debugPathStrings[] = { @@ -1533,15 +1533,19 @@ static const char *const debugPathStrings[] = // TRANSLATORS: map view type in status bar N_("(U) ultra map view 2"), // TRANSLATORS: map view type in status bar - N_("(e) empty map view"), + N_("(e) empty map view with collision"), // TRANSLATORS: map view type in status bar - N_("(b) black & white map view") + N_("(E) empty map view"), + // TRANSLATORS: map view type in status bar + N_("(b) black & white map view"), + // TRANSLATORS: pickup size in status bar + N_("(?) map view") }; -std::string LocalPlayer::getDebugPathString() +std::string LocalPlayer::getMapDrawTypeString() { return gettext(getVarItem(&debugPathStrings[0], - viewport->getDebugPath(), debugPathSize)); + viewport->getMapDrawType(), debugPathSize)); } const unsigned magicAttackSize = 5; @@ -3733,12 +3737,12 @@ void LocalPlayer::resetYellowBar() mPickUpType = config.resetIntValue("pickUpType"); if (viewport) { - viewport->setDebugPath(0); + viewport->setMapDrawType(0); if (viewport->getCameraMode()) viewport->toggleCameraMode(); } if (mMap) - mMap->setDebugFlags(0); + mMap->setDrawLayersFlags(0); mImitationMode = config.resetIntValue("imitationMode"); mDisableGameModifiers = config.resetBoolValue("disableGameModifiers"); diff --git a/src/being/localplayer.h b/src/being/localplayer.h index 2eb236918..8e72bf5d6 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -468,7 +468,7 @@ class LocalPlayer final : public Being, std::string getPickUpTypeString(); - static std::string getDebugPathString(); + static std::string getMapDrawTypeString(); std::string getMagicAttackString(); |