diff --git a/Makefile b/Makefile index 1fde07d18f..f38a496f5a 100644 --- a/Makefile +++ b/Makefile @@ -158,17 +158,17 @@ mod_cnc: $(cnc_TARGET) $(ralint_TARGET) mods: mod_ra mod_cnc OpenRA.Editor.Form1.resources: - resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources + resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null editor: OpenRA.Editor.Form1.resources $(editor_TARGET) ralint: $(ralint_TARGET) seqed: SequenceEditor.Form1.resources $(seqed_TARGET) SequenceEditor.Form1.resources: - resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources + resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null mapcvtr: $(mapcvtr_TARGET) filex: $(filex_TARGET) tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET) OpenRA.TilesetBuilder.Form1.resources: - resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources + resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null tools: editor ralint seqed mapcvtr filex tsbuild all: game tools diff --git a/OpenRA.FileFormats/Package.cs b/OpenRA.FileFormats/Package.cs index 5447d66a04..62805d7838 100644 --- a/OpenRA.FileFormats/Package.cs +++ b/OpenRA.FileFormats/Package.cs @@ -68,7 +68,7 @@ namespace OpenRA.FileFormats BinaryReader reader2 = new BinaryReader(ms); ushort numFiles = reader2.ReadUInt16(); - uint datasize = reader2.ReadUInt32(); + reader2.ReadUInt32(); /*datasize*/ s.Position = headerStart; reader = new BinaryReader(s); diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index a19487246b..3023e16073 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -231,6 +231,7 @@ namespace OpenRA return sb.ToString(); } + #pragma warning disable 0472, 0162 internal static void DumpSyncReport(int frame) { var f = syncReports.FirstOrDefault(a => a.First == frame); diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 8dd2938746..a6c6405e56 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -29,7 +29,6 @@ namespace OpenRA.Server = new Dictionary>(); static Session lobbyInfo; static bool GameStarted = false; - static string[] initialMods; static string Name; static WebClient wc = new WebClient(); static int ExternalPort; @@ -51,7 +50,6 @@ namespace OpenRA.Server Server.masterServerUrl = masterServerUrl; isInternetServer = internetServer; listener = new TcpListener(IPAddress.Any, port); - initialMods = mods; Name = name; ExternalPort = extport; randomSeed = (int)DateTime.Now.ToBinary(); diff --git a/OpenRA.Game/Traits/Unit.cs b/OpenRA.Game/Traits/Unit.cs index 8a6c384db6..878e8fa10d 100755 --- a/OpenRA.Game/Traits/Unit.cs +++ b/OpenRA.Game/Traits/Unit.cs @@ -28,7 +28,6 @@ namespace OpenRA.Traits public void Damaged(Actor self, AttackInfo e) { - var eva = self.World.WorldActor.Info.Traits.Get(); if (e.DamageState == DamageState.Dead) if (self.Owner == self.World.LocalPlayer) Sound.PlayVoice("Lost", self); diff --git a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs b/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs index 7313031f32..8a741d1eac 100644 --- a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs +++ b/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs @@ -70,7 +70,6 @@ namespace OpenRA.Widgets var powers = world.LocalPlayer.PlayerActor.traits.WithInterface(); var numPowers = powers.Count(p => p.IsAvailable); if (numPowers == 0) return; - var position = RenderOrigin; var rectBounds = RenderBounds; WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(rectBounds.X,rectBounds.Y)); for (var i = 1; i < numPowers; i++) diff --git a/OpenRA.Mods.RA/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs index 7a2361c50a..29e0bc5ebc 100644 --- a/OpenRA.Mods.RA/Bridge.cs +++ b/OpenRA.Mods.RA/Bridge.cs @@ -21,6 +21,7 @@ namespace OpenRA.Mods.RA { public readonly bool Long = false; + #pragma warning disable 0649 public readonly ushort Template; public readonly ushort DamagedTemplate; public readonly ushort DestroyedTemplate; @@ -29,6 +30,7 @@ namespace OpenRA.Mods.RA public readonly ushort DestroyedPlusNorthTemplate; public readonly ushort DestroyedPlusSouthTemplate; public readonly ushort DestroyedPlusBothTemplate; + #pragma warning restore 0649 public readonly string[] ShorePieces = {"br1", "br2"}; public readonly int[] NorthOffset = null; public readonly int[] SouthOffset = null;