From a6b44c12a2b82f27b425bf192041a10fac9586e2 Mon Sep 17 00:00:00 2001 From: elexis Date: Sun, 29 Nov 2015 13:38:10 +0000 Subject: [PATCH] Don't replace the custom colors of scenario maps with default colors. Fixes #3627. This was SVN commit r17320. --- .../data/mods/public/gui/gamesetup/gamesetup.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js index 805c02ea81..a7cdc8a0a1 100644 --- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js +++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js @@ -813,11 +813,14 @@ function sanitizePlayerData(playerData) }); // Replace colors with the best matching color of PlayerDefaults - playerData.forEach((pData, index) => { - let colorDistances = g_PlayerColors.map(color => colorDistance(color, pData.Color)); - let smallestDistance = colorDistances.find(distance => colorDistances.every(distance2 => (distance2 >= distance))); - pData.Color = g_PlayerColors.find(color => colorDistance(color, pData.Color) == smallestDistance); - }); + if (g_GameAttributes.mapType != "scenario") + { + playerData.forEach((pData, index) => { + let colorDistances = g_PlayerColors.map(color => colorDistance(color, pData.Color)); + let smallestDistance = colorDistances.find(distance => colorDistances.every(distance2 => (distance2 >= distance))); + pData.Color = g_PlayerColors.find(color => colorDistance(color, pData.Color) == smallestDistance); + }); + } ensureUniquePlayerColors(playerData); }