summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-25 21:36:32 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-25 21:36:32 +0300
commit0d06cc2ed6bbf6b6f53619e56cbd2fbda2a480a0 (patch)
treeb7c361d537a95b6c4321b8f6037e41ff86af6630 /src
parent8357e89fc0923f4b97cf8b990a4ffba2716bfabf (diff)
downloadmv-0d06cc2ed6bbf6b6f53619e56cbd2fbda2a480a0.tar.gz
mv-0d06cc2ed6bbf6b6f53619e56cbd2fbda2a480a0.tar.bz2
mv-0d06cc2ed6bbf6b6f53619e56cbd2fbda2a480a0.tar.xz
mv-0d06cc2ed6bbf6b6f53619e56cbd2fbda2a480a0.zip
add option for enable/disable pets support.
Diffstat (limited to 'src')
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/gui/widgets/tabs/setup_other.cpp4
3 files changed, 6 insertions, 1 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 7a3a198c1..bdd18b439 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -3185,7 +3185,7 @@ void Being::addEffect(const std::string &name)
void Being::addPet(const int id)
{
- if (!actorManager)
+ if (!actorManager || !config.getBoolValue("usepets"))
return;
removePet();
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 360e6e469..3d27b62b7 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -354,6 +354,7 @@ DefaultsData* getConfigDefaults()
AddDEF("buySortOrder", 0);
AddDEF("showmotd", false);
AddDEF("playMapAnimations", true);
+ AddDEF("usepets", true);
return configData;
}
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index b03cf5f41..8a11f8960 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -243,6 +243,10 @@ Setup_Other::Setup_Other(const Widget2 *const widget) :
new SetupItemCheckBox(_("Enable advert protocol"), "",
"enableAdvert", this, "enableAdvertEvent");
+ // TRANSLATORS: settings option
+ new SetupItemCheckBox(_("Enabled pets support"),
+ "", "usepets", this, "usepetsEvent");
+
new SetupItemCheckBox(_("Enable weight notifications"), "",
"weightMsg", this, "weightMsgEvent");