smite some compile errors
This commit is contained in:
@@ -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));
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -227,7 +227,6 @@ namespace OpenRA.Mods.RA
|
||||
foreach (var a in newProdBuildings)
|
||||
{
|
||||
activeProductionBuildings.Add(a);
|
||||
var rp = self.TraitOrDefault<RallyPoint>();
|
||||
int2 newRallyPoint = ChooseRallyLocationNear(a.Location);
|
||||
Game.IssueOrder(new Order("SetRallyPoint", a, newRallyPoint));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user