Ticket #3209: t3209_keep_victory_condition.patch

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

@@ -387 +387 @@
         Engine.GetGUIObjectByName("mapSelection").focus();
     }
 
     if (g_IsController)
     {
-        loadGameAttributes();
+        loadPersistMatchSettings();
         // Sync g_GameAttributes to everyone.
         if (g_IsInGuiUpdate)
             warn("initMain() called while in GUI update");
 
         updateGameAttributes();
@@ -674 +674 @@
     return g_MapData[name];
 }
 
 const FILEPATH_MATCHSETTINGS_SP = "config/matchsettings.json";
 const FILEPATH_MATCHSETTINGS_MP = "config/matchsettings.mp.json";
-function loadGameAttributes()
+function loadPersistMatchSettings()
 {
     if (Engine.ConfigDB_GetValue("user", "persistmatchsettings") != "true")
         return;
 
     var settingsFile = g_IsNetworked ? FILEPATH_MATCHSETTINGS_MP : FILEPATH_MATCHSETTINGS_SP;
@@ -718 +718 @@
         {
             if (civListCodes.indexOf(playerData[i].Civ) < 0)
                 playerData[i].Civ = "random";
         }
     }
-
     // Refresh probably obsoleted/incomplete map data.
     var newMapData = loadMapData(mapName);
     if (newMapData && newMapData.settings)
     {
         for (var prop in newMapData.settings)
@@ -742 +741 @@
     initMapNameList();
 
     var mapSelectionBox = Engine.GetGUIObjectByName("mapSelection");
     mapSelectionBox.selected = mapSelectionBox.list_data.indexOf(mapName);
 
+    if (attrs.gameSpeed)
+    {
+        var gameSpeedBox = Engine.GetGUIObjectByName("gameSpeed");
+        gameSpeedBox.selected = g_GameSpeeds.speeds.indexOf(attrs.gameSpeed);
+    }
+    if (mapSettings.GameType)
+    {
+        var victoryConditions = Engine.GetGUIObjectByName("victoryCondition");
+        var victories = getVictoryConditions();
+        victoryConditions.selected = victories.data.indexOf(mapSettings.GameType);
+    }
     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);
     }
-
     if (mapSettings.Ceasefire)
     {
         var ceasefireBox = Engine.GetGUIObjectByName("ceasefire");
         ceasefireBox.selected = ceasefireBox.list_data.indexOf(mapSettings.Ceasefire);
     }
-
-    if (attrs.gameSpeed)
-    {
-        var gameSpeedBox = Engine.GetGUIObjectByName("gameSpeed");
-        gameSpeedBox.selected = g_GameSpeeds.speeds.indexOf(attrs.gameSpeed);
-    }
-
     if (!Engine.HasXmppClient())
     {
         g_GameAttributes.settings.RatingEnabled = false;
         Engine.SetRankedGame(false);
         Engine.GetGUIObjectByName("enableRating").checked = false;
         Engine.GetGUIObjectByName("enableCheats").enabled = true;
         Engine.GetGUIObjectByName("lockTeams").enabled = true;
     }
-
     g_IsInGuiUpdate = false;
 
     onGameAttributesChange();
 }
 
@@ -975 +976 @@
             g_GameAttributes.settings[prop] = undefined;
 
     var mapData = loadMapData(name);
     var mapSettings = (mapData && mapData.settings ? deepcopy(mapData.settings) : {});
 
-    // Reset victory conditions
-    var victories = getVictoryConditions();
-    var victoryIdx = (mapSettings.GameType !== undefined && victories.data.indexOf(mapSettings.GameType) != -1 ? victories.data.indexOf(mapSettings.GameType) : VICTORY_DEFAULTIDX);
-    g_GameAttributes.settings.GameType = victories.data[victoryIdx];
-    g_GameAttributes.settings.VictoryScripts = victories.scripts[victoryIdx];
-
     // Copy any new settings
     g_GameAttributes.map = name;
     g_GameAttributes.script = mapSettings.Script;
     if (g_GameAttributes.map !== "random")
         for (var prop in mapSettings)