Add option for paths.xml for enable/disable new mail system.

3 files changed, 6 insertions, 1 deletions

diff --git a/src/client.cpp b/src/client.cpp
index f2e565bdd..b59033213 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1737,6 +1737,7 @@ void Client::initPaths()
     settings.playerBadgeAtRightOffset = paths.getIntValue(
         "playerBadgeAtRightOffset");
     settings.unknownSkillsAutoTab = paths.getBoolValue("unknownSkillsAutoTab");
+    settings.enableNewMailSystem = paths.getBoolValue("enableNewMailSystem");
 }
 
 void Client::initTradeFilter()
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 03e78bacb..5a26ba8f8 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -709,6 +709,8 @@ DefaultsData* getPathsDefaults()
     AddDEF("gmDefaultLevel", 60);
 #endif  // TMWA_SUPPORT
 
+    AddDEF("enableNewMailSystem", true);
+
     return configData;
 }
 
diff --git a/src/settings.h b/src/settings.h
index 760ee3e37..308da0202 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -92,7 +92,8 @@ class Settings final
             legacyEffects(true),
             enableRemoteCommands(true),
             uselonglivesprites(false),
-            unknownSkillsAutoTab(true)
+            unknownSkillsAutoTab(true),
+            enableNewMailSystem(true)
         { }
 
         A_DELETE_COPY(Settings)
@@ -157,6 +158,7 @@ class Settings final
         bool enableRemoteCommands;
         bool uselonglivesprites;
         bool unknownSkillsAutoTab;
+        bool enableNewMailSystem;
 };
 
 extern Settings settings;