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

2
OpenRA.Game/Game.cs
View File

@@ -355,7 +355,7 @@ namespace OpenRA
ExternalMods = new ExternalMods(); ExternalMods = new ExternalMods();
if (modID != null && Mods.TryGetValue(modID, out var currentMod)) if (modID != null && Mods.TryGetValue(modID, out _))
{ {
var launchPath = args.GetValue("Engine.LaunchPath", Assembly.GetEntryAssembly().Location); var launchPath = args.GetValue("Engine.LaunchPath", Assembly.GetEntryAssembly().Location);

2
OpenRA.Game/Graphics/SpriteLoader.cs
View File

@@ -139,7 +139,7 @@ namespace OpenRA.Graphics
public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders) public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
{ {
frames = new Cache<string, ISpriteFrame[]>(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out var metadata)); frames = new Cache<string, ISpriteFrame[]>(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out _));
} }
public ISpriteFrame[] this[string filename] { get { return frames[filename]; } } public ISpriteFrame[] this[string filename] { get { return frames[filename]; } }

2
OpenRA.Mods.Cnc/FileSystem/MixFile.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Cnc.FileSystem
List<PackageEntry> entries; List<PackageEntry> entries;
if (isEncrypted) if (isEncrypted)
entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out var unused); entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out _);
else else
entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart); entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);

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

2
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Mods.Common.Traits
// requestedTargetPresetForActivity will be cleared once the activity starts running and calls UpdateRequestedTarget // requestedTargetPresetForActivity will be cleared once the activity starts running and calls UpdateRequestedTarget
if (self.CurrentActivity != null && self.CurrentActivity.NextActivity == requestedTargetPresetForActivity) if (self.CurrentActivity != null && self.CurrentActivity.NextActivity == requestedTargetPresetForActivity)
{ {
RequestedTarget = RequestedTarget.Recalculate(self.Owner, out var targetIsHiddenActor); RequestedTarget = RequestedTarget.Recalculate(self.Owner, out _);
} }
// Requested activity has been canceled // Requested activity has been canceled

2
OpenRA.Mods.Common/Traits/BotModules/Squads/States/AirStates.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
protected static bool NearToPosSafely(Squad owner, WPos loc) protected static bool NearToPosSafely(Squad owner, WPos loc)
{ {
return NearToPosSafely(owner, loc, out var a); return NearToPosSafely(owner, loc, out _);
} }
protected static bool NearToPosSafely(Squad owner, WPos loc, out Actor detectedEnemyTarget) protected static bool NearToPosSafely(Squad owner, WPos loc, out Actor detectedEnemyTarget)

2
OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
for (var i = 0; i < Palette.Size; i++) for (var i = 0; i < Palette.Size; i++)
palColors[i] = palette.GetColor(i); palColors[i] = palette.GetColor(i);
var frames = FrameLoader.GetFrames(File.OpenRead(src), modData.SpriteLoaders, out var metadata); var frames = FrameLoader.GetFrames(File.OpenRead(src), modData.SpriteLoaders, out _);
var usePadding = !args.Contains("--nopadding"); var usePadding = !args.Contains("--nopadding");
var count = 0; var count = 0;

4
OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
foreach (var part in parts) foreach (var part in parts)
{ {
if (!byte.TryParse(part, out var component)) if (!byte.TryParse(part, out _))
{ {
invalid = true; invalid = true;
Console.WriteLine("Invalid component in color (argument " + i + "): [" + part + "]: " + args[i]); Console.WriteLine("Invalid component in color (argument " + i + "): [" + part + "]: " + args[i]);
@@ -125,7 +125,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
foreach (var part in parts) foreach (var part in parts)
{ {
if (!byte.TryParse(part, out var component)) if (!byte.TryParse(part, out _))
{ {
invalid = true; invalid = true;
Console.WriteLine("Invalid component in color (argument " + i + "): [" + part + "]: " + args[i]); Console.WriteLine("Invalid component in color (argument " + i + "): [" + part + "]: " + args[i]);

2
OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
View File

@@ -235,7 +235,7 @@ namespace OpenRA.Mods.Common.Widgets
public void Set(Color color) public void Set(Color color)
{ {
color.ToAhsv(out var a, out var h, out var s, out var v); color.ToAhsv(out _, out var h, out var s, out var v);
if (H != h || S != s || V != v) if (H != h || S != s || V != v)
{ {

2
OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
View File

@@ -187,7 +187,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
static float HueFromColor(Color c) static float HueFromColor(Color c)
{ {
c.ToAhsv(out var a, out var h, out var s, out var v); c.ToAhsv(out _, out var h, out _, out _);
return h; return h;
} }

2
OpenRA.Platforms.Default/Sdl2PlatformWindow.cs
View File

@@ -174,7 +174,7 @@ namespace OpenRA.Platforms.Default
// This is not necessary on macOS, which defines window sizes in effective units ("points"). // This is not necessary on macOS, which defines window sizes in effective units ("points").
if (Platform.CurrentPlatform == PlatformType.Windows) if (Platform.CurrentPlatform == PlatformType.Windows)
{ {
if (SDL.SDL_GetDisplayDPI(videoDisplay, out var ddpi, out var hdpi, out var vdpi) == 0) if (SDL.SDL_GetDisplayDPI(videoDisplay, out var ddpi, out _, out _) == 0)
windowScale = ddpi / 96; windowScale = ddpi / 96;
} }
else if (Platform.CurrentPlatform != PlatformType.OSX) else if (Platform.CurrentPlatform != PlatformType.OSX)

6
OpenRA.Platforms.Default/Shader.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Platforms.Default
{ {
OpenGL.glGetShaderiv(shader, OpenGL.GL_INFO_LOG_LENGTH, out var len); OpenGL.glGetShaderiv(shader, OpenGL.GL_INFO_LOG_LENGTH, out var len);
var log = new StringBuilder(len); var log = new StringBuilder(len);
OpenGL.glGetShaderInfoLog(shader, len, out var length, log); OpenGL.glGetShaderInfoLog(shader, len, out _, log);
Log.Write("graphics", "GL Info Log:\n{0}", log.ToString()); Log.Write("graphics", "GL Info Log:\n{0}", log.ToString());
throw new InvalidProgramException("Compile error in shader object '{0}'".F(filename)); throw new InvalidProgramException("Compile error in shader object '{0}'".F(filename));
@@ -104,7 +104,7 @@ namespace OpenRA.Platforms.Default
OpenGL.glGetProgramiv(program, OpenGL.GL_INFO_LOG_LENGTH, out var len); OpenGL.glGetProgramiv(program, OpenGL.GL_INFO_LOG_LENGTH, out var len);
var log = new StringBuilder(len); var log = new StringBuilder(len);
OpenGL.glGetProgramInfoLog(program, len, out var length, log); OpenGL.glGetProgramInfoLog(program, len, out _, log);
Log.Write("graphics", "GL Info Log:\n{0}", log.ToString()); Log.Write("graphics", "GL Info Log:\n{0}", log.ToString());
throw new InvalidProgramException("Link error in shader program '{0}'".F(name)); throw new InvalidProgramException("Link error in shader program '{0}'".F(name));
} }
@@ -120,7 +120,7 @@ namespace OpenRA.Platforms.Default
for (var i = 0; i < numUniforms; i++) for (var i = 0; i < numUniforms; i++)
{ {
var sb = new StringBuilder(128); var sb = new StringBuilder(128);
OpenGL.glGetActiveUniform(program, i, 128, out var length, out var size, out var type, sb); OpenGL.glGetActiveUniform(program, i, 128, out _, out _, out var type, sb);
var sampler = sb.ToString(); var sampler = sb.ToString();
OpenGL.CheckGLError(); OpenGL.CheckGLError();