Ticket #3883: persist_match_settings_v8.patch

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -868 +868 @@
     if (Engine.ConfigDB_GetValue("user", "persistmatchsettings") != "true")
         return;
 
+    // Load file
     let settingsFile = g_IsNetworked ? g_MatchSettings_MP : g_MatchSettings_SP;
     if (!Engine.FileExists(settingsFile))
         return;
@@ -878 +879 @@
 
     g_IsInGuiUpdate = true;
 
+    // Find which settings can be changed by the user
+    let allowedSettings = ["PlayerData"];
+
+    if (attrs.mapType == "skirmish" || attrs.mapType == "random")
+        allowedSettings = allowedSettings.concat(
+        [
+            "GameType",
+            "WonderDuration",
+            "PopulationCap",
+            "Ceasefire",
+            "StartingResources",
+            "RevealMap",
+            "LockTeams",
+            "ExploreMap",
+            "DisableTreasures"
+        ]);
+
+    if (attrs.mapType == "random")
+        allowedSettings.push("Size");
+
+    if (g_IsNetworked)
+        allowedSettings.push("CheatsEnabled");
+
+    if (Engine.HasXmppClient())
+        allowedSettings.push("RatingEnabled");
+
+    // Only load settings which can be changed by the user
+    for (let prop in attrs.settings)
+        if (!(prop in allowedSettings))
+            delete attrs.settings[prop];
+
+        if (attrs.settings.RatingEnabled)
+            attrs.settings.CheatsEnabled = false;
+
+    // Restore valid matchsettings
     let mapName = attrs.map || "";
     let mapSettings = attrs.settings;
 
@@ -913 +949 @@
     // Reload, as the maptype or mapfilter might have changed
     initMapNameList();
 
-    g_GameAttributes.settings.RatingEnabled = Engine.HasXmppClient();
-    Engine.SetRankedGame(g_GameAttributes.settings.RatingEnabled);
+    Engine.SetRankedGame(!!g_GameAttributes.settings.RatingEnabled);
 
     updateGUIObjects();
 }