Do not reset victory conditions when changing map selection. The behavior is now coherent with everything else (players, etc.) when selecting random maps.

Patch by elexis, fixes #3209

This was SVN commit r16840.
This commit is contained in:
Nicolas Auvray 2015-07-09 16:52:12 +00:00
parent b3fa75529b
commit 1b88eaf1cd

View File

@ -977,12 +977,6 @@ function selectMap(name)
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;