From 648c85816ca9398dd9c672d5d4230bef030e0274 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 Jul 2014 02:30:20 +0300
Subject: move "change camera mode" option into gamemodifiers.

---
 src/being/localplayer.cpp | 20 +-------------------
 src/being/localplayer.h   |  2 --
 2 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'src/being')

diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 77706051c..11102a67f 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1255,24 +1255,6 @@ void LocalPlayer::changeMode(unsigned *restrict const var,
         debugMsg(str.substr(4));
 }
 
-const unsigned cameraModeSize = 2;
-
-static const char *const cameraModeStrings[] =
-{
-    // TRANSLATORS: camera mode in status bar
-    N_("(G) game camera mode"),
-    // TRANSLATORS: camera mode in status bar
-    N_("(F) free camera mode"),
-    // TRANSLATORS: camera mode in status bar
-    N_("(?) away")
-};
-
-std::string LocalPlayer::getCameraModeString()
-{
-    return gettext(getVarItem(&cameraModeStrings[0],
-        viewport->getCameraMode(), cameraModeSize));
-}
-
 void LocalPlayer::changeEquipmentBeforeAttack(const Being *const target) const
 {
     if (settings.attackWeaponType == 1 || !target || !PlayerInfo::getInventory())
@@ -3271,7 +3253,7 @@ void LocalPlayer::resetYellowBar()
     if (viewport)
     {
         settings.mapDrawType = MapType::NORMAL;
-        if (viewport->getCameraMode())
+        if (settings.cameraMode)
             viewport->toggleCameraMode();
     }
     if (mMap)
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 3aabda22d..96e6efb88 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -387,8 +387,6 @@ class LocalPlayer final : public Being,
         void setTestParticle(const std::string &fileName,
                              const bool updateHash = true);
 
-        static std::string getCameraModeString();
-
         int getLastAttackX() const override final
         { return mTarget ? mTarget->getTileX() : mLastAttackX; }
 
-- 
cgit v1.2.3-70-g09d2