diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index e5a0e8c3fb..5a0c05ab05 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -355,7 +355,7 @@ namespace OpenRA 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); diff --git a/OpenRA.Game/Graphics/SpriteLoader.cs b/OpenRA.Game/Graphics/SpriteLoader.cs index db393b9d79..ec6da2ddd3 100644 --- a/OpenRA.Game/Graphics/SpriteLoader.cs +++ b/OpenRA.Game/Graphics/SpriteLoader.cs @@ -139,7 +139,7 @@ namespace OpenRA.Graphics public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders) { - frames = new Cache(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out var metadata)); + frames = new Cache(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out _)); } public ISpriteFrame[] this[string filename] { get { return frames[filename]; } } diff --git a/OpenRA.Mods.Cnc/FileSystem/MixFile.cs b/OpenRA.Mods.Cnc/FileSystem/MixFile.cs index a7954dd35f..dfdb890560 100644 --- a/OpenRA.Mods.Cnc/FileSystem/MixFile.cs +++ b/OpenRA.Mods.Cnc/FileSystem/MixFile.cs @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Cnc.FileSystem List entries; if (isEncrypted) - entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out var unused); + entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out _); else entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart); diff --git a/OpenRA.Mods.Common/ColorValidator.cs b/OpenRA.Mods.Common/ColorValidator.cs index 407e2c794a..3dd2cd3a09 100644 --- a/OpenRA.Mods.Common/ColorValidator.cs +++ b/OpenRA.Mods.Common/ColorValidator.cs @@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common public bool IsValid(Color askedColor, out Color forbiddenColor, IEnumerable terrainColors, IEnumerable playerColors, HashSet 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; } diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs index b760012e78..bbffb2a822 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs @@ -108,7 +108,7 @@ namespace OpenRA.Mods.Common.Traits // requestedTargetPresetForActivity will be cleared once the activity starts running and calls UpdateRequestedTarget 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 diff --git a/OpenRA.Mods.Common/Traits/BotModules/Squads/States/AirStates.cs b/OpenRA.Mods.Common/Traits/BotModules/Squads/States/AirStates.cs index c7caf40d89..d7c9eedd1f 100644 --- a/OpenRA.Mods.Common/Traits/BotModules/Squads/States/AirStates.cs +++ b/OpenRA.Mods.Common/Traits/BotModules/Squads/States/AirStates.cs @@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads 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) diff --git a/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs index 51ce9afd08..96d93da491 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.UtilityCommands for (var i = 0; i < Palette.Size; 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 count = 0; diff --git a/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs b/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs index ef0de63987..9a79ad6573 100644 --- a/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs +++ b/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.UtilityCommands { foreach (var part in parts) { - if (!byte.TryParse(part, out var component)) + if (!byte.TryParse(part, out _)) { invalid = true; 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) { - if (!byte.TryParse(part, out var component)) + if (!byte.TryParse(part, out _)) { invalid = true; Console.WriteLine("Invalid component in color (argument " + i + "): [" + part + "]: " + args[i]); diff --git a/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs index bcb609e66a..fa965d35f9 100644 --- a/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs +++ b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs @@ -235,7 +235,7 @@ namespace OpenRA.Mods.Common.Widgets 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) { diff --git a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs index 88aa6dc1d7..a8792e669b 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs @@ -187,7 +187,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic 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; } diff --git a/OpenRA.Platforms.Default/Sdl2PlatformWindow.cs b/OpenRA.Platforms.Default/Sdl2PlatformWindow.cs index cc653d9674..46e8db6121 100644 --- a/OpenRA.Platforms.Default/Sdl2PlatformWindow.cs +++ b/OpenRA.Platforms.Default/Sdl2PlatformWindow.cs @@ -174,7 +174,7 @@ namespace OpenRA.Platforms.Default // This is not necessary on macOS, which defines window sizes in effective units ("points"). 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; } else if (Platform.CurrentPlatform != PlatformType.OSX) diff --git a/OpenRA.Platforms.Default/Shader.cs b/OpenRA.Platforms.Default/Shader.cs index 55ec199fd8..1ae7dd9b67 100644 --- a/OpenRA.Platforms.Default/Shader.cs +++ b/OpenRA.Platforms.Default/Shader.cs @@ -57,7 +57,7 @@ namespace OpenRA.Platforms.Default { OpenGL.glGetShaderiv(shader, OpenGL.GL_INFO_LOG_LENGTH, out var 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()); 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); 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()); 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++) { 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(); OpenGL.CheckGLError();