move "change crazy move" option into gamemodifiers.

2 files changed, 10 insertions, 43 deletions

diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index df42ffc24..956ff07eb 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -113,7 +113,6 @@ LocalPlayer::LocalPlayer(const int id, const uint16_t subtype) :
     AttributeListener(),
     StatListener(),
     mGMLevel(0),
-    mCrazyMoveType(config.getIntValue("crazyMoveType")),
     mCrazyMoveState(0),
     mAttackWeaponType(config.getIntValue("attackWeaponType")),
     mQuickDropCounter(config.getIntValue("quickDropCounter")),
@@ -1270,35 +1269,6 @@ void LocalPlayer::changeMode(unsigned *restrict const var,
         debugMsg(str.substr(4));
 }
 
-static const unsigned crazyMoveTypeSize = 11;
-
-void LocalPlayer::changeCrazyMoveType(const bool forward)
-{
-    mCrazyMoveState = 0;
-    changeMode(&mCrazyMoveType, crazyMoveTypeSize, "crazyMoveType",
-        &LocalPlayer::getCrazyMoveTypeString, 1, true, forward);
-}
-
-std::string LocalPlayer::getCrazyMoveTypeString()
-{
-    if (mCrazyMoveType < crazyMoveTypeSize - 1)
-    {
-        // TRANSLATORS: crazy move type in status bar
-        return strprintf(_("(%u) crazy move number %u"),
-            mCrazyMoveType, mCrazyMoveType);
-    }
-    else if (mCrazyMoveType == crazyMoveTypeSize - 1)
-    {
-        // TRANSLATORS: crazy move type in status bar
-        return _("(a) custom crazy move");
-    }
-    else
-    {
-        // TRANSLATORS: crazy move type in status bar
-        return _("(?) crazy move");
-    }
-}
-
 static const unsigned moveToTargetTypeSize = 13;
 
 void LocalPlayer::changeMoveToTargetType(const bool forward)
@@ -1787,7 +1757,7 @@ void LocalPlayer::crazyMove()
 {
     const bool oldDisableCrazyMove = mDisableCrazyMove;
     mDisableCrazyMove = true;
-    switch (mCrazyMoveType)
+    switch (settings.crazyMoveType)
     {
         case 1:
             crazyMove1();
@@ -3693,7 +3663,7 @@ void LocalPlayer::checkNewName(Being *const being)
 void LocalPlayer::resetYellowBar()
 {
     settings.moveType = 0;
-    mCrazyMoveType = config.resetIntValue("crazyMoveType");
+    settings.crazyMoveType = config.resetIntValue("crazyMoveType");
     mMoveToTargetType = config.resetIntValue("moveToTargetType");
     mFollowMode = config.resetIntValue("followMode");
     mAttackWeaponType = config.resetIntValue("attackWeaponType");
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 5a2d10627..319825e65 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -208,9 +208,6 @@ class LocalPlayer final : public Being,
 
         void changePickUpType(const bool forward);
 
-        int getCrazyMoveType() const A_WARN_UNUSED
-        { return mCrazyMoveType; }
-
         int getPickUpType() const A_WARN_UNUSED
         { return mPickUpType; }
 
@@ -221,12 +218,18 @@ class LocalPlayer final : public Being,
 
         void changeQuickDropCounter(const bool forward);
 
-        int getMoveState() const A_WARN_UNUSED
+        unsigned int getMoveState() const A_WARN_UNUSED
         { return mMoveState; }
 
-        void setMoveState(const int n)
+        void setMoveState(const unsigned int n)
         { mMoveState = n; }
 
+        unsigned int getCrazyMoveState() const A_WARN_UNUSED
+        { return mCrazyMoveState; }
+
+        void setCrazyMoveState(const unsigned int n)
+        { mCrazyMoveState = n; }
+
         void switchMagicAttack(const bool forward);
 
         void switchPvpAttack(const bool forward);
@@ -259,8 +262,6 @@ class LocalPlayer final : public Being,
 
         bool pickUpItems(int pickUpType = 0);
 
-        void changeCrazyMoveType(const bool forward);
-
         void crazyMove();
 
         void moveTo(const int x, const int y);
@@ -443,8 +444,6 @@ class LocalPlayer final : public Being,
         void setTestParticle(const std::string &fileName,
                              const bool updateHash = true);
 
-        std::string getCrazyMoveTypeString();
-
         std::string getMoveToTargetTypeString();
 
         std::string getFollowModeString();
@@ -527,8 +526,6 @@ class LocalPlayer final : public Being,
 
         int mGMLevel;
 
-        // crazy move type
-        unsigned int mCrazyMoveType;
         // crazy move state
         unsigned int mCrazyMoveState;
         // attack weapon type