summaryrefslogtreecommitdiff
path: root/src/gui/popups/popupmenu.cpp
diff options
context:
space:
mode:
authorDan Sagunov <danilka.pro@gmail.com>2013-11-04 14:06:06 +0400
committerDan Sagunov <danilka.pro@gmail.com>2013-11-04 14:06:06 +0400
commit25d33c793a85aa1f62fd2d03378e25078aaf410a (patch)
treeb2068b328011e93b98ac21f1c92aee17b5c268e2 /src/gui/popups/popupmenu.cpp
parent61bc04f3a499c4ff856a37d161219d6de733d9d1 (diff)
parent2ba2b398bdee802ed8c09819562de0afb34a1229 (diff)
downloadmv-25d33c793a85aa1f62fd2d03378e25078aaf410a.tar.gz
mv-25d33c793a85aa1f62fd2d03378e25078aaf410a.tar.bz2
mv-25d33c793a85aa1f62fd2d03378e25078aaf410a.tar.xz
mv-25d33c793a85aa1f62fd2d03378e25078aaf410a.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/popups/popupmenu.cpp')
-rw-r--r--src/gui/popups/popupmenu.cpp7
1 files changed, 5 insertions, 2 deletions
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"));