Ticket #3883: persist_match_settings_v9.1.patch

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

@@ -846 +846 @@
     mapSelectionBox.selected = Math.max(0, mapListFiles.indexOf(g_GameAttributes.map || ""));
 }
 
+/**
+ * Removes every setting the user cannot change
+ */
+function removeInvalidSettings(attrs)
+{
+    // 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 (allowedSettings.indexOf(prop) == -1)
+            delete attrs.settings[prop];
+
+    if (attrs.settings.RatingEnabled)
+        attrs.settings.CheatsEnabled = false;
+}
+
 function loadMapData(name)
 {
     if (!name || !g_MapPath[g_GameAttributes.mapType])
@@ -868 +908 @@
     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 +919 @@
 
     g_IsInGuiUpdate = true;
 
+    removeInvalidSettings(attrs);
+
+    // Restore valid matchsettings
     let mapName = attrs.map || "";
     let mapSettings = attrs.settings;
 
@@ -913 +957 @@
     // 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();
 }
@@ -1125 +1168 @@
     if (g_IsInGuiUpdate || !g_IsController || !name)
         return;
 
-    // Reset some map specific properties which are not necessarily redefined on each map
-    for (let prop of ["TriggerScripts", "CircularMap", "Garrison"])
-        g_GameAttributes.settings[prop] = undefined;
+    removeInvalidSettings(g_GameAttributes);
 
     let mapData = loadMapData(name);
     let mapSettings = mapData && mapData.settings ? deepcopy(mapData.settings) : {};
 
-    // Reset victory conditions
-    if (g_GameAttributes.mapType != "random")
-    {
-        let victoryIdx = g_VictoryConditions.Name.indexOf(mapSettings.GameType || "") != -1 ? g_VictoryConditions.Name.indexOf(mapSettings.GameType) : g_VictoryConditions.Default;
-        g_GameAttributes.settings.GameType = g_VictoryConditions.Name[victoryIdx];
-        g_GameAttributes.settings.VictoryScripts = g_VictoryConditions.Scripts[victoryIdx];
-    }
-
-    if (g_GameAttributes.mapType == "scenario")
-        delete g_GameAttributes.settings.WonderDuration;
-
     if (mapSettings.PlayerData)
         sanitizePlayerData(mapSettings.PlayerData);
 
@@ -1176 +1206 @@
                 Engine.AssignNetworkPlayer(player, "");
         }
     }
-
     updateGameAttributes();
 }