Ticket #2963: preserveGameAttributes.patch

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

@@ -401 +401 @@
         // to allow easy keyboard selection of maps
         Engine.GetGUIObjectByName("mapSelection").focus();
     }
-    // Sync g_GameAttributes to everyone.
+
     if (g_IsController)
+    {
+        loadGameAttributesFromUserCfg();
+        // Sync g_GameAttributes to everyone.
         updateGameAttributes();
+    }
 }
 
 function handleNetMessage(message)
@@ -688 +692 @@
     return g_MapData[name];
 }
 
+const CONFIGID_GAMEATTRIBUTES_SP = "lobbysettings";
+const CONFIGID_GAMEATTRIBUTES_MP = "lobbysettings_mp";
+function loadGameAttributesFromUserCfg()
+{
+    var newAttributes_str = Engine.ConfigDB_GetValue("user", g_IsNetworked ? CONFIGID_GAMEATTRIBUTES_MP : CONFIGID_GAMEATTRIBUTES_SP);
+    if (newAttributes_str == null || newAttributes_str == "")
+        return;
+
+    try
+    {
+        var attrs = JSON.parse(newAttributes_str);
+    }
+    catch (e)
+    {
+        warn("Error while loading game settings from user config: "+e);
+        return;
+    }
+
+    if (!attrs.settings)
+        return;
+
+    g_IsInGuiUpdate = true;
+
+    // TODO: Check new attributes for being semantically correct.
+    g_GameAttributes = attrs;
+
+    var mapName = attrs.map || "";
+    var mapSettings = attrs.settings;
+
+    // Assign new seeds and match id
+    attrs.matchID = Engine.GetMatchID();
+    mapSettings.Seed = Math.floor(Math.random() * 65536);
+    mapSettings.AISeed = Math.floor(Math.random() * 65536);
+
+    var mapFilterSelection = Engine.GetGUIObjectByName("mapFilterSelection");
+    mapFilterSelection.selected = mapFilterSelection.list_data.indexOf(attrs.mapFilter);
+
+    var mapTypeSelection = Engine.GetGUIObjectByName("mapTypeSelection");
+    mapTypeSelection.selected = mapTypeSelection.list_data.indexOf(attrs.mapType);
+
+    initMapNameList();
+
+    var mapSelectionBox = Engine.GetGUIObjectByName("mapSelection");
+    mapSelectionBox.selected = mapSelectionBox.list_data.indexOf(mapName);
+
+    if (mapSettings.PopulationCap)
+    {
+        var populationCapBox = Engine.GetGUIObjectByName("populationCap");
+        populationCapBox.selected = populationCapBox.list_data.indexOf(mapSettings.PopulationCap);
+    }
+    if (mapSettings.StartingResources)
+    {
+        var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
+        startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
+    }
+
+    g_IsInGuiUpdate = false;
+
+    onGameAttributesChange();
+}
+
+function saveGameAttributesToUserCfg()
+{
+    Engine.ConfigDB_CreateValue("user",  g_IsNetworked ? CONFIGID_GAMEATTRIBUTES_MP : CONFIGID_GAMEATTRIBUTES_SP, JSON.stringify(g_GameAttributes));
+    Engine.ConfigDB_WriteFile("user", "config/user.cfg");
+}
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // GUI event handlers
 
 function cancelSetup()
 {
+    if (g_IsController)
+        saveGameAttributesToUserCfg();
+
     Engine.DisconnectNetworkGame();
 
     if (Engine.HasXmppClient())
@@ -803 +876 @@
     {
     case "scenario":
         // Set a default map
-        // TODO: This should be remembered from the last session
         g_GameAttributes.mapPath = "maps/scenarios/";
         g_GameAttributes.map = g_GameAttributes.mapPath + (g_IsNetworked ? DEFAULT_NETWORKED_MAP : DEFAULT_OFFLINE_MAP);
         g_GameAttributes.settings.AISeed = Math.floor(Math.random() * 65536);
@@ -984 +1056 @@
         }
     }
 
+    saveGameAttributesToUserCfg();
+
     if (g_IsNetworked)
     {
         Engine.SetNetworkGameAttributes(g_GameAttributes);