Merge branch 'master' of gitorious.org:manaplus/manaplus

4 files changed, 10 insertions, 2 deletions

diff --git a/src/client.cpp b/src/client.cpp
index a64ed424a..272b5b1da 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1346,6 +1346,7 @@ int Client::gameExec()
                     if (!BeingInfo::unknown)
                         BeingInfo::unknown = new BeingInfo;
 
+                    initFeatures();
                     TranslationManager::loadCurrentLang();
                     PlayerInfo::stateChange(mState);
 
diff --git a/src/commands.cpp b/src/commands.cpp
index 551aa9943..75347a9aa 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -743,6 +743,9 @@ impHandler(follow)
     if (!player_node)
         return;
 
+    if (!features.getBoolValue("allowFollow"))
+        return;
+
     if (!args.empty())
         player_node->setFollow(args);
     else if (tab && tab->getType() == ChatTab::TAB_WHISPER)
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 50406890d..98ad30398 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -495,6 +495,7 @@ DefaultsData* getFeaturesDefaults()
 {
     DefaultsData *const configData = new DefaultsData;
     AddDEF("languageTab", false);
+    AddDEF("allowFollow", true);
     return configData;
 }
 
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 4f6bb3372..a9ca65b36 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -2574,8 +2574,11 @@ void PopupMenu::addPlayerRelation(const std::string &name)
 
 void PopupMenu::addFollow()
 {
-    // TRANSLATORS: popup menu item
-    mBrowserBox->addRow("follow", _("Follow"));
+    if (features.getBoolValue("allowFollow"))
+    {
+        // TRANSLATORS: popup menu item
+        mBrowserBox->addRow("follow", _("Follow"));
+    }
     // TRANSLATORS: popup menu item
     // TRANSLATORS: imitate player
     mBrowserBox->addRow("imitation", _("Imitation"));