epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smite some compile errors

Browse Source
This commit is contained in:
alzeih
2010-08-24 23:44:22 +12:00
parent 703f3b8c13
commit a00f0b18a0
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.FileFormats/Graphics/VqaReader.cs
View File

@@ -22,7 +22,6 @@ namespace OpenRA.FileFormats
Stream stream; Stream stream;
int currentFrame; int currentFrame;
ushort flags;
ushort numColors; ushort numColors;
ushort blockWidth; ushort blockWidth;
ushort blockHeight; ushort blockHeight;
@@ -62,7 +61,7 @@ namespace OpenRA.FileFormats
/* var length = */reader.ReadUInt32(); /* var length = */reader.ReadUInt32();
/*var version = */reader.ReadUInt16(); /*var version = */reader.ReadUInt16();
flags = reader.ReadUInt16(); /*var flags = */reader.ReadUInt16();
Frames = reader.ReadUInt16(); Frames = reader.ReadUInt16();
Width = reader.ReadUInt16(); Width = reader.ReadUInt16();
Height = reader.ReadUInt16(); Height = reader.ReadUInt16();
@@ -82,7 +81,7 @@ namespace OpenRA.FileFormats
/*var freq = */reader.ReadUInt16(); /*var freq = */reader.ReadUInt16();
/*var channels = */reader.ReadByte(); /*var channels = */reader.ReadByte();
/*var bits = */reader.ReadByte(); /*var bits = */reader.ReadByte();
var unknown3 = reader.ReadChars(14); /*var unknown3 = */reader.ReadChars(14);
var frameSize = NextPowerOf2(Math.Max(Width,Height)); var frameSize = NextPowerOf2(Math.Max(Width,Height));

5
OpenRA.Game/Map.cs
View File

@@ -174,10 +174,9 @@ namespace OpenRA
/* hack: make some slots. */ /* hack: make some slots. */
if (!Players.Any(p => p.Value.Playable)) if (!Players.Any(p => p.Value.Playable))
{ {
int index = 0; for (int index = 0; index < Waypoints.Count; index++)
foreach (var wp in Waypoints)
{ {
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); Players.Add(p.Name, p);
} }
} }

3
OpenRA.Game/Server/Server.cs
View File

@@ -32,7 +32,6 @@ namespace OpenRA.Server
static Session lobbyInfo; static Session lobbyInfo;
static bool GameStarted = false; static bool GameStarted = false;
static string Name; static string Name;
static WebClient wc = new WebClient();
static int ExternalPort; static int ExternalPort;
static int randomSeed; static int randomSeed;
@@ -584,7 +583,7 @@ namespace OpenRA.Server
using (var wc = new WebClient()) using (var wc = new WebClient())
{ {
var result = wc.DownloadData( wc.DownloadData(
masterServerUrl + url.F( masterServerUrl + url.F(
ExternalPort, Uri.EscapeUriString(Name), ExternalPort, Uri.EscapeUriString(Name),
GameStarted ? 2 : 1, // todo: post-game states, etc. GameStarted ? 2 : 1, // todo: post-game states, etc.

1
OpenRA.Mods.RA/World/HackyAI.cs
View File

@@ -227,7 +227,6 @@ namespace OpenRA.Mods.RA
foreach (var a in newProdBuildings) foreach (var a in newProdBuildings)
{ {
activeProductionBuildings.Add(a); activeProductionBuildings.Add(a);
var rp = self.TraitOrDefault<RallyPoint>();
int2 newRallyPoint = ChooseRallyLocationNear(a.Location); int2 newRallyPoint = ChooseRallyLocationNear(a.Location);
Game.IssueOrder(new Order("SetRallyPoint", a, newRallyPoint)); Game.IssueOrder(new Order("SetRallyPoint", a, newRallyPoint));
} }