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

smite some compiler warnings, hide those that are to stay.

Browse Source 
Hide some makefile output too
This commit is contained in:
alzeih
2010-07-22 01:24:42 +12:00
parent 55fd5c3b9b
commit 3f9ffbac80
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -158,17 +158,17 @@ mod_cnc: $(cnc_TARGET) $(ralint_TARGET)
mods: mod_ra mod_cnc mods: mod_ra mod_cnc
OpenRA.Editor.Form1.resources: 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) editor: OpenRA.Editor.Form1.resources $(editor_TARGET)
ralint: $(ralint_TARGET) ralint: $(ralint_TARGET)
seqed: SequenceEditor.Form1.resources $(seqed_TARGET) seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
SequenceEditor.Form1.resources: SequenceEditor.Form1.resources:
resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
mapcvtr: $(mapcvtr_TARGET) mapcvtr: $(mapcvtr_TARGET)
filex: $(filex_TARGET) filex: $(filex_TARGET)
tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET) tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
OpenRA.TilesetBuilder.Form1.resources: 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 tools: editor ralint seqed mapcvtr filex tsbuild
all: game tools all: game tools

2
OpenRA.FileFormats/Package.cs
View File

@@ -68,7 +68,7 @@ namespace OpenRA.FileFormats
BinaryReader reader2 = new BinaryReader(ms); BinaryReader reader2 = new BinaryReader(ms);
ushort numFiles = reader2.ReadUInt16(); ushort numFiles = reader2.ReadUInt16();
uint datasize = reader2.ReadUInt32(); reader2.ReadUInt32(); /*datasize*/
s.Position = headerStart; s.Position = headerStart;
reader = new BinaryReader(s); reader = new BinaryReader(s);

1
OpenRA.Game/Game.cs
View File

@@ -231,6 +231,7 @@ namespace OpenRA
return sb.ToString(); return sb.ToString();
} }
#pragma warning disable 0472, 0162
internal static void DumpSyncReport(int frame) internal static void DumpSyncReport(int frame)
{ {
var f = syncReports.FirstOrDefault(a => a.First == frame); var f = syncReports.FirstOrDefault(a => a.First == frame);

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

@@ -29,7 +29,6 @@ namespace OpenRA.Server
= new Dictionary<int, List<Connection>>(); = new Dictionary<int, List<Connection>>();
static Session lobbyInfo; static Session lobbyInfo;
static bool GameStarted = false; static bool GameStarted = false;
static string[] initialMods;
static string Name; static string Name;
static WebClient wc = new WebClient(); static WebClient wc = new WebClient();
static int ExternalPort; static int ExternalPort;
@@ -51,7 +50,6 @@ namespace OpenRA.Server
Server.masterServerUrl = masterServerUrl; Server.masterServerUrl = masterServerUrl;
isInternetServer = internetServer; isInternetServer = internetServer;
listener = new TcpListener(IPAddress.Any, port); listener = new TcpListener(IPAddress.Any, port);
initialMods = mods;
Name = name; Name = name;
ExternalPort = extport; ExternalPort = extport;
randomSeed = (int)DateTime.Now.ToBinary(); randomSeed = (int)DateTime.Now.ToBinary();

1
OpenRA.Game/Traits/Unit.cs
View File

@@ -28,7 +28,6 @@ namespace OpenRA.Traits
public void Damaged(Actor self, AttackInfo e) public void Damaged(Actor self, AttackInfo e)
{ {
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
if (e.DamageState == DamageState.Dead) if (e.DamageState == DamageState.Dead)
if (self.Owner == self.World.LocalPlayer) if (self.Owner == self.World.LocalPlayer)
Sound.PlayVoice("Lost", self); Sound.PlayVoice("Lost", self);

1
OpenRA.Game/Widgets/SpecialPowerBinWidget.cs
View File

@@ -70,7 +70,6 @@ namespace OpenRA.Widgets
var powers = world.LocalPlayer.PlayerActor.traits.WithInterface<SupportPower>(); var powers = world.LocalPlayer.PlayerActor.traits.WithInterface<SupportPower>();
var numPowers = powers.Count(p => p.IsAvailable); var numPowers = powers.Count(p => p.IsAvailable);
if (numPowers == 0) return; if (numPowers == 0) return;
var position = RenderOrigin;
var rectBounds = RenderBounds; var rectBounds = RenderBounds;
WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(rectBounds.X,rectBounds.Y)); WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(rectBounds.X,rectBounds.Y));
for (var i = 1; i < numPowers; i++) for (var i = 1; i < numPowers; i++)

2
OpenRA.Mods.RA/Bridge.cs
View File

@@ -21,6 +21,7 @@ namespace OpenRA.Mods.RA
{ {
public readonly bool Long = false; public readonly bool Long = false;
#pragma warning disable 0649
public readonly ushort Template; public readonly ushort Template;
public readonly ushort DamagedTemplate; public readonly ushort DamagedTemplate;
public readonly ushort DestroyedTemplate; public readonly ushort DestroyedTemplate;
@@ -29,6 +30,7 @@ namespace OpenRA.Mods.RA
public readonly ushort DestroyedPlusNorthTemplate; public readonly ushort DestroyedPlusNorthTemplate;
public readonly ushort DestroyedPlusSouthTemplate; public readonly ushort DestroyedPlusSouthTemplate;
public readonly ushort DestroyedPlusBothTemplate; public readonly ushort DestroyedPlusBothTemplate;
#pragma warning restore 0649
public readonly string[] ShorePieces = {"br1", "br2"}; public readonly string[] ShorePieces = {"br1", "br2"};
public readonly int[] NorthOffset = null; public readonly int[] NorthOffset = null;
public readonly int[] SouthOffset = null; public readonly int[] SouthOffset = null;