From a00f0b18a0c288fe11a65a34de8ce85c67b01182 Mon Sep 17 00:00:00 2001 From: alzeih Date: Tue, 24 Aug 2010 23:44:22 +1200 Subject: [PATCH] smite some compile errors --- OpenRA.FileFormats/Graphics/VqaReader.cs | 5 ++--- OpenRA.Game/Map.cs | 5 ++--- OpenRA.Game/Server/Server.cs | 3 +-- OpenRA.Mods.RA/World/HackyAI.cs | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/OpenRA.FileFormats/Graphics/VqaReader.cs b/OpenRA.FileFormats/Graphics/VqaReader.cs index c2d9b33741..d7e75d1f34 100644 --- a/OpenRA.FileFormats/Graphics/VqaReader.cs +++ b/OpenRA.FileFormats/Graphics/VqaReader.cs @@ -22,7 +22,6 @@ namespace OpenRA.FileFormats Stream stream; int currentFrame; - ushort flags; ushort numColors; ushort blockWidth; ushort blockHeight; @@ -62,7 +61,7 @@ namespace OpenRA.FileFormats /* var length = */reader.ReadUInt32(); /*var version = */reader.ReadUInt16(); - flags = reader.ReadUInt16(); + /*var flags = */reader.ReadUInt16(); Frames = reader.ReadUInt16(); Width = reader.ReadUInt16(); Height = reader.ReadUInt16(); @@ -82,7 +81,7 @@ namespace OpenRA.FileFormats /*var freq = */reader.ReadUInt16(); /*var channels = */reader.ReadByte(); /*var bits = */reader.ReadByte(); - var unknown3 = reader.ReadChars(14); + /*var unknown3 = */reader.ReadChars(14); var frameSize = NextPowerOf2(Math.Max(Width,Height)); diff --git a/OpenRA.Game/Map.cs b/OpenRA.Game/Map.cs index f3f63bb828..e509ac15ee 100755 --- a/OpenRA.Game/Map.cs +++ b/OpenRA.Game/Map.cs @@ -174,10 +174,9 @@ namespace OpenRA /* hack: make some slots. */ if (!Players.Any(p => p.Value.Playable)) { - int index = 0; - foreach (var wp in Waypoints) + for (int index = 0; index < Waypoints.Count; index++) { - var p = new PlayerReference("Multi{0}".F(index++), "Random", false, false) { Playable = true }; + var p = new PlayerReference("Multi{0}".F(index), "Random", false, false) { Playable = true }; Players.Add(p.Name, p); } } diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index e126082bae..77354ed31c 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -32,7 +32,6 @@ namespace OpenRA.Server static Session lobbyInfo; static bool GameStarted = false; static string Name; - static WebClient wc = new WebClient(); static int ExternalPort; static int randomSeed; @@ -584,7 +583,7 @@ namespace OpenRA.Server using (var wc = new WebClient()) { - var result = wc.DownloadData( + wc.DownloadData( masterServerUrl + url.F( ExternalPort, Uri.EscapeUriString(Name), GameStarted ? 2 : 1, // todo: post-game states, etc. diff --git a/OpenRA.Mods.RA/World/HackyAI.cs b/OpenRA.Mods.RA/World/HackyAI.cs index e8be41d225..b40e0c2609 100644 --- a/OpenRA.Mods.RA/World/HackyAI.cs +++ b/OpenRA.Mods.RA/World/HackyAI.cs @@ -227,7 +227,6 @@ namespace OpenRA.Mods.RA foreach (var a in newProdBuildings) { activeProductionBuildings.Add(a); - var rp = self.TraitOrDefault(); int2 newRallyPoint = ChooseRallyLocationNear(a.Location); Game.IssueOrder(new Order("SetRallyPoint", a, newRallyPoint)); }