diff --git a/.editorconfig b/.editorconfig index 3ac91b1148..f24baa6198 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1031,6 +1031,9 @@ dotnet_diagnostic.RCS1132.severity = warning # Remove redundant Dispose/Close call. dotnet_diagnostic.RCS1133.severity = warning +# Remove redundant statement. +dotnet_diagnostic.RCS1134.severity = warning + # Merge switch sections with equivalent content. dotnet_diagnostic.RCS1136.severity = warning diff --git a/OpenRA.Mods.Cnc/Traits/PortableChrono.cs b/OpenRA.Mods.Cnc/Traits/PortableChrono.cs index daffc1d53b..8a39ceccfe 100644 --- a/OpenRA.Mods.Cnc/Traits/PortableChrono.cs +++ b/OpenRA.Mods.Cnc/Traits/PortableChrono.cs @@ -204,8 +204,6 @@ namespace OpenRA.Mods.Cnc.Traits cursor = targetCursor; return true; } - - return false; } return false; @@ -252,7 +250,6 @@ namespace OpenRA.Mods.Cnc.Traits if (portableChrono.IsTraitDisabled || portableChrono.IsTraitPaused) { world.CancelInputMode(); - return; } } diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs index 4e57805876..cc1b550404 100644 --- a/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs @@ -34,10 +34,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands public override void ValidateMapFormat(int format) { if (format < 2) - { Console.WriteLine($"ERROR: Detected NewINIFormat {format}. Are you trying to import a Tiberian Dawn map?"); - return; - } } // Mapping from RA95 overlay index to type string @@ -146,46 +143,46 @@ namespace OpenRA.Mods.Cnc.UtilityCommands string faction; switch (section) { - case "Spain": - color = "gold"; - faction = "allies"; - break; - case "England": - color = "green"; - faction = "allies"; - break; - case "Ukraine": - color = "orange"; - faction = "soviet"; - break; - case "Germany": - color = "black"; - faction = "allies"; - break; - case "France": - color = "teal"; - faction = "allies"; - break; - case "Turkey": - color = "salmon"; - faction = "allies"; - break; - case "Greece": - case "GoodGuy": - color = "blue"; - faction = "allies"; - break; - case "USSR": - case "BadGuy": - color = "red"; - faction = "soviet"; - break; - case "Special": - case "Neutral": - default: - color = "neutral"; - faction = "allies"; - break; + case "Spain": + color = "gold"; + faction = "allies"; + break; + case "England": + color = "green"; + faction = "allies"; + break; + case "Ukraine": + color = "orange"; + faction = "soviet"; + break; + case "Germany": + color = "black"; + faction = "allies"; + break; + case "France": + color = "teal"; + faction = "allies"; + break; + case "Turkey": + color = "salmon"; + faction = "allies"; + break; + case "Greece": + case "GoodGuy": + color = "blue"; + faction = "allies"; + break; + case "USSR": + case "BadGuy": + color = "red"; + faction = "soviet"; + break; + case "Special": + case "Neutral": + default: + color = "neutral"; + faction = "allies"; + break; } SetMapPlayers(section, faction, color, file, Players, MapPlayers); diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs index 73ee5f8e4c..b775ec3b5d 100644 --- a/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs @@ -32,10 +32,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands public override void ValidateMapFormat(int format) { if (format > 1) - { Console.WriteLine($"ERROR: Detected NewINIFormat {format}. Are you trying to import a Red Alert map?"); - return; - } } static readonly Dictionary OverlayResourceMapping = new() @@ -145,20 +142,20 @@ namespace OpenRA.Mods.Cnc.UtilityCommands string faction; switch (section) { - case "GoodGuy": - color = "gold"; - faction = "gdi"; - break; - case "BadGuy": - color = "red"; - faction = "nod"; - break; - case "Special": - case "Neutral": - default: - color = "neutral"; - faction = "gdi"; - break; + case "GoodGuy": + color = "gold"; + faction = "gdi"; + break; + case "BadGuy": + color = "red"; + faction = "nod"; + break; + case "Special": + case "Neutral": + default: + color = "neutral"; + faction = "gdi"; + break; } SetMapPlayers(section, faction, color, file, Players, MapPlayers); diff --git a/OpenRA.Mods.Common/Activities/DeployForGrantedCondition.cs b/OpenRA.Mods.Common/Activities/DeployForGrantedCondition.cs index 31c777ee65..9dcac6dc5b 100644 --- a/OpenRA.Mods.Common/Activities/DeployForGrantedCondition.cs +++ b/OpenRA.Mods.Common/Activities/DeployForGrantedCondition.cs @@ -50,8 +50,6 @@ namespace OpenRA.Mods.Common.Activities if (NextActivity != null) foreach (var n in NextActivity.TargetLineNodes(self)) yield return n; - - yield break; } } diff --git a/OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs b/OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs index f9cf4bfed4..076544dc1e 100644 --- a/OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs +++ b/OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs @@ -103,8 +103,6 @@ namespace OpenRA.Mods.Common.Activities { foreach (var n in getMove().TargetLineNodes(self)) yield return n; - - yield break; } } } diff --git a/OpenRA.Mods.Common/Activities/Move/Nudge.cs b/OpenRA.Mods.Common/Activities/Move/Nudge.cs index 0fb90b01af..e4c22fc27b 100644 --- a/OpenRA.Mods.Common/Activities/Move/Nudge.cs +++ b/OpenRA.Mods.Common/Activities/Move/Nudge.cs @@ -59,8 +59,6 @@ namespace OpenRA.Mods.Common.Traits if (ChildActivity != null) foreach (var n in ChildActivity.TargetLineNodes(self)) yield return n; - - yield break; } } } diff --git a/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs b/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs index f3d060d8cc..3572632c71 100644 --- a/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs +++ b/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs @@ -46,7 +46,6 @@ namespace OpenRA.Mods.Common.Activities { base.Cancel(self, keepQueue); Dispose(); - return; } public void Dispose() diff --git a/OpenRA.Mods.Common/Traits/Cloak.cs b/OpenRA.Mods.Common/Traits/Cloak.cs index 490fd9b0dc..cc908def95 100644 --- a/OpenRA.Mods.Common/Traits/Cloak.cs +++ b/OpenRA.Mods.Common/Traits/Cloak.cs @@ -313,7 +313,7 @@ namespace OpenRA.Mods.Common.Traits Uncloak(); } - void INotifySupportPower.Charged(Actor self) { return; } + void INotifySupportPower.Charged(Actor self) { } void INotifySupportPower.Activated(Actor self) { diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeployWithCharge.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeployWithCharge.cs index 6d32fc608e..ed718caeb2 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeployWithCharge.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeployWithCharge.cs @@ -256,8 +256,6 @@ namespace OpenRA.Mods.Common.Traits if (NextActivity != null) foreach (var n in NextActivity.TargetLineNodes(self)) yield return n; - - yield break; } } } diff --git a/OpenRA.Mods.Common/Traits/Player/ClassicParallelProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ClassicParallelProductionQueue.cs index b4013132f8..38f4f31b7f 100644 --- a/OpenRA.Mods.Common/Traits/Player/ClassicParallelProductionQueue.cs +++ b/OpenRA.Mods.Common/Traits/Player/ClassicParallelProductionQueue.cs @@ -181,10 +181,7 @@ namespace OpenRA.Mods.Common.Traits } if (!anyProducers) - { CancelProduction(unit.Name, 1); - return false; - } return false; } diff --git a/OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs index 13f1a7be3d..5b338d7985 100644 --- a/OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs +++ b/OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs @@ -131,10 +131,7 @@ namespace OpenRA.Mods.Common.Traits } if (!anyProducers) - { CancelProduction(unit.Name, 1); - return false; - } return false; } diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20200503/RemoveLaysTerrain.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20200503/RemoveLaysTerrain.cs index aa5369a8b1..dff309c7ef 100644 --- a/OpenRA.Mods.Common/UpdateRules/Rules/20200503/RemoveLaysTerrain.cs +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20200503/RemoveLaysTerrain.cs @@ -23,8 +23,6 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules { if (actorNode.RemoveNodes("LaysTerrain") > 0) yield return $"'LaysTerrain' was removed from {actorNode.Key} ({actorNode.Location.Filename}) without replacement.\n"; - - yield break; } } } diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20230801/ExtractResourceStorageFromHarvester.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20230801/ExtractResourceStorageFromHarvester.cs index c7f66be928..96d0d3b9c1 100644 --- a/OpenRA.Mods.Common/UpdateRules/Rules/20230801/ExtractResourceStorageFromHarvester.cs +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20230801/ExtractResourceStorageFromHarvester.cs @@ -42,8 +42,6 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules storesResources.AddNode(resources); actorNode.AddNode(storesResources); - - yield break; } } } diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs index 5e945aeac4..e285c4dabe 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs @@ -225,7 +225,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic { Log.Write("debug", $"Map editor ignoring actor {actor.Name}, " + $"because of missing sprites for tileset {World.Map.Rules.TerrainInfo.Id}."); - continue; } } } diff --git a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs index 2a8bc347f4..b6926cbdf3 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs @@ -570,7 +570,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic catch (Exception ex) { Log.Write("debug", ex.ToString()); - return; } }