epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use discard syntax

Browse Source
This commit is contained in:
teinarss
2020-08-16 11:12:07 +02:00
committed by Paul Chote
parent 27f1a7ab27
commit 8d27d22100
12 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/ColorValidator.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common
public bool IsValid(Color askedColor, out Color forbiddenColor, IEnumerable<Color> terrainColors, IEnumerable<Color> playerColors, HashSet<string> errorMessages = null)
{
// Validate color against HSV
askedColor.ToAhsv(out var a, out var h, out var s, out var v);
askedColor.ToAhsv(out _, out _, out var s, out var v);
if (s < HsvSaturationRange[0] || s > HsvSaturationRange[1] || v < HsvValueRange[0] || v > HsvValueRange[1])
{
if (errorMessages != null)
@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common
if (TeamColorPresets.Any())
{
foreach (var c in TeamColorPresets.Shuffle(random))
if (IsValid(c, out var forbidden, terrainColors, playerColors))
if (IsValid(c, out _, terrainColors, playerColors))
return c;
}
@@ -110,7 +110,7 @@ namespace OpenRA.Mods.Common
var v = float2.Lerp(HsvValueRange[0], HsvValueRange[1], random.NextFloat());
color = Color.FromAhsv(h, s, v);
}
while (!IsValid(color, out var forbidden, terrainColors, playerColors));
while (!IsValid(color, out _, terrainColors, playerColors));
return color;
}