Ticket #3883: roughsketch.patch

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

@@ -817 +817 @@
 function loadPersistMatchSettings()
 {
     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;
 
     let attrs = Engine.ReadJSONFile(settingsFile);
     if (!attrs || !attrs.settings)
         return;
 
+    // Find which settings can be changed by the user
+    let allowedSettings = ["GameSpeed", "map", "maptype", "mapfilter"];
+
+    if (attrs.mapType == "skirmish" || attrs.mapType == "skirmish")
+        allowedSettings = allowedSettings.concat(["victorycondition", "population cap", "starting resources", "ceasefire", "revealed map", "explored map", "disable treasures", "teams locked"]);
+
+    if (attrs.mapType == "random")
+        allowedSettings = allowedSettings.concat(["mapsize", "numPlayers"]);
+
+    attrs.settings.RatingEnabled = Engine.HasXmppClient();
+    Engine.SetRankedGame(attrs.settings.RatingEnabled);
+
+    if (g_IsNetworked && !attrs.settings.RatingEnabled)
+        allowedSettings.push("cheats");
+
+    // Only load settings which can be changed by the user
+    for (let prop in attrs)
+        if (!prop in allowedSettings)
+            delete attrs[prop];
+
+    // Restore valid matchsettings
     g_IsInGuiUpdate = true;
 
     let mapName = attrs.map || "";
     let mapSettings = attrs.settings;
 
@@ -862 +884 @@
         sanitizePlayerData(mapSettings.PlayerData);
 
     // Reload, as the maptype or mapfilter might have changed
     initMapNameList();
 
-    g_GameAttributes.settings.RatingEnabled = Engine.HasXmppClient();
-    Engine.SetRankedGame(g_GameAttributes.settings.RatingEnabled);
-
     updateGUIObjects();
 }
 
 function savePersistMatchSettings()
 {