summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-04 12:50:28 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-04 12:50:28 +0300
commit2ba2b398bdee802ed8c09819562de0afb34a1229 (patch)
treea5426fa3960b6a4dc92d351aa93f886672c176f8
parent71d4ccedddfb7bdafd7b05bbb669d71164a4dc37 (diff)
downloadmv-2ba2b398bdee802ed8c09819562de0afb34a1229.tar.gz
mv-2ba2b398bdee802ed8c09819562de0afb34a1229.tar.bz2
mv-2ba2b398bdee802ed8c09819562de0afb34a1229.tar.xz
mv-2ba2b398bdee802ed8c09819562de0afb34a1229.zip
Add option for features.xml for allow/not allow follow.
New option: allowFollow default value is 1.
-rw-r--r--src/commands.cpp3
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/gui/popups/popupmenu.cpp7
3 files changed, 9 insertions, 2 deletions
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"));