abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Don't pick a civ that shouldn't be selectable in gamesetup when civ random was choosen

Browse Source 
Discovered by Undying Nephalim.
Investigated by s0600204
Reviewed by: s0600204
Differential Revision: https://code.wildfiregames.com/D1455
This was SVN commit r21736.
This commit is contained in:
Imarok 2018-04-16 19:50:02 +00:00
parent 077538d06c
commit d171156e99
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -2179,7 +2179,8 @@ function launchGame()
if (chosenCiv == "random")
{
let culture = pickRandom(cultures);
chosenCiv = pickRandom(Object.keys(g_CivData).filter(civ => g_CivData[civ].Culture == culture));
chosenCiv = pickRandom(Object.keys(g_CivData).filter(civ =>
g_CivData[civ].Culture == culture && g_CivData[civ].SelectableInGameSetup));
}
g_GameAttributes.settings.PlayerData[i].Civ = chosenCiv;