Ticket #2982: preserveSettingsFix.patch

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

@@ -74 +74 @@
 // tick handler
 var g_LoadingState = 0; // 0 = not started, 1 = loading, 2 = loaded
 
+// Used when restoring previously saved game settings in networked games.
+// Used for assigning the host player to the slot he/she previously was at.
+var g_HostPlayerSlot = -1;
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 function init(attribs)
@@ -480 +484 @@
 
         // Update the player list
         g_PlayerAssignments = message.hosts;
+
+        // Assign the host player to the previously selected slot.
+        if (g_HostPlayerSlot > 0)
+        {
+            g_GameAttributes.settings.PlayerData[g_HostPlayerSlot].AI = g_AIs[0].id;
+            updateGameAttributes();
+            swapPlayers(Object.keys(g_PlayerAssignments)[0], g_HostPlayerSlot);
+            g_HostPlayerSlot = -1;
+        }
+
         updatePlayerList();
         if (g_PlayerAssignments[newPlayer] && g_PlayerAssignments[newPlayer].player != -1)
             resetReady = true;
@@ -717 +731 @@
     mapSettings.Seed = Math.floor(Math.random() * 65536);
     mapSettings.AISeed = Math.floor(Math.random() * 65536);
 
+    var aiCodes = [ ai.id for each (ai in g_AIs) ];
+    var civListCodes = [ civ.Code for each (civ in g_CivData) if (civ.SelectableInGameSetup !== false) ];
+    civListCodes.push("random");
+
+    g_HostPlayerSlot = -1;
+    var playerData = mapSettings.PlayerData;
+    if (playerData)
+    {
+        for (var i = 0; i < playerData.length; ++i)
+        {
+            // Discard previously unassigned/player slots
+            if (aiCodes.indexOf(playerData[i].AI) < 0)
+                playerData[i].AI = aiCodes[0];
+
+            if (playerData[i].isHostPlayer)
+            {
+                g_HostPlayerSlot = i;
+                playerData[i].isHostPlayer = undefined;
+            }
+
+            // Validate player civs.
+            if (civListCodes.indexOf(playerData[i].Civ) <0)
+                playerData[i].Civ = "random";
+        }
+    }
+
     // TODO: Check new attributes for being semantically correct.
     g_GameAttributes = attrs;
 
@@ -745 +785 @@
     g_IsInGuiUpdate = false;
 
     onGameAttributesChange();
+
+    // Assign the host player to the previously selected slot.
+    if (g_HostPlayerSlot > 0 && !g_IsNetworked)
+    {
+        Engine.GetGUIObjectByName("playerAssignment["+g_HostPlayerSlot+"]").selected = 0;
+        g_HostPlayerSlot = -1;
+    }
+    // If it's a networked game, assign the host player slot as soon as the first player data arrives in handleNetMessage()
 }
 
 function saveGameAttributes()
 {
-    var attributes = Engine.ConfigDB_GetValue("user", "persistmatchsettings") == "true" ? g_GameAttributes : {};
+    var attributes = {};
+    if(Engine.ConfigDB_GetValue("user", "persistmatchsettings") == "true")
+    {
+        attributes = g_GameAttributes;
+
+        // Assign a flag that determines the first real player
+        if (g_PlayerAssignments)
+        {
+            var hostGuid = Object.keys(g_PlayerAssignments)[0];
+            var hostPlayerIndex = g_PlayerAssignments[hostGuid].player - 1;
+
+            if (hostPlayerIndex >= 0 && attributes.settings.PlayerData.length > hostPlayerIndex)
+                attributes.settings.PlayerData[hostPlayerIndex].isHostPlayer=true;
+        }
+    }
+
     Engine.WriteJSONFile(g_IsNetworked ? FILEPATH_MATCHSETTINGS_MP : FILEPATH_MATCHSETTINGS_SP, attributes);
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////