Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

1 files changed, 35 insertions, 6 deletions

diff --git a/src/localplayer.h b/src/localplayer.h
index 08ebbe841..5b755e4f6 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -37,12 +37,6 @@
 #include <memory>
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ChatTab;
 class FloorItem;
 class ImageSet;
@@ -483,6 +477,36 @@ class LocalPlayer : public Being, public ActorSpriteListener,
 
         bool checAttackPermissions(Being *target);
 
+        std::string getInvertDirectionString();
+
+        std::string getCrazyMoveTypeString();
+
+        std::string getMoveToTargetTypeString();
+
+        std::string getFollowModeString();
+
+        std::string getAttackWeaponTypeString();
+
+        std::string getAttackTypeString();
+
+        std::string getQuickDropCounterString();
+
+        std::string getPickUpTypeString();
+
+        std::string getDebugPathString();
+
+        std::string getMagicAttackString();
+
+        std::string getPvpAttackString();
+
+        std::string getImitationModeString();
+
+        std::string getAwayModeString();
+
+        std::string getCameraModeString();
+
+        std::string getGameModifiersString();
+
     protected:
         /** Whether or not the name settings have changed */
         bool mUpdateName;
@@ -496,6 +520,11 @@ class LocalPlayer : public Being, public ActorSpriteListener,
         void tryMagic(std::string spell, int baseMagic,
                       int schoolMagic, int mana);
 
+        const char *getVarItem(const char **arr, unsigned index, unsigned sz);
+
+        void changeMode(unsigned *var, unsigned limit, const char *conf,
+                        std::string (LocalPlayer::*func)(), unsigned def = 0);
+
         void crazyMove1();
         void crazyMove2();
         void crazyMove3();