gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Sanitize playername in sanitizePlayerData in gamesetup and remove some hardcodings.

Browse Source 
Fixes #4501

Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D426
This was SVN commit r19530.
This commit is contained in:
Imarok
2017-05-07 22:28:56 +00:00
parent 06bbcd6b76
commit a397f9bccb
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/gamesetup/gamesetup.js
+8 -12
View File
@@ -886,8 +886,12 @@ function initDefaults()
g_DefaultPlayerData = g_Settings.PlayerDefaults;
g_DefaultPlayerData.shift();
// Don't change the underlying defaults file, as Atlas uses that file too
for (let i in g_DefaultPlayerData)
{
g_DefaultPlayerData[i].Civ = "random";
g_DefaultPlayerData[i].Teams = -1;
}
}
/**
@@ -1360,19 +1364,11 @@ function sanitizePlayerData(playerData)
if (playerData.length && !playerData[0])
playerData.shift();
// Use defaults if the map doesn't specify a value
playerData.forEach((pData, index) => {
pData.Color = pData.Color || g_PlayerColorPickerList[index];
pData.Civ = pData.Civ || "random";
if (!("Team" in pData))
pData.Team = -1;
// Use default AI if the map doesn't specify any explicitly
if (!("AI" in pData))
pData.AI = g_DefaultPlayerData[index].AI;
if (!("AIDiff" in pData))
pData.AIDiff = g_DefaultPlayerData[index].AIDiff;
for (let prop in g_DefaultPlayerData[index])
if (!(prop in pData))
pData[prop] = g_DefaultPlayerData[index][prop];
});
// Replace colors with the best matching color of PlayerDefaults