add option for enable/disable pets support.

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");