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

Squash compiler warnings

Browse Source
This commit is contained in:
Paul Chote
2011-04-07 21:26:57 +12:00
parent b0425aff3b
commit aba14eec23
11 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Editor/RenderUtils.cs
View File

@@ -95,7 +95,6 @@ namespace OpenRA.Editor
public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
{
var ri = info.Traits.Get<RenderSimpleInfo>();
var image = RenderSimple.GetImage(info, tileset.Id);
using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))

8
OpenRA.FileFormats/Graphics/PngLoader.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.FileFormats.Graphics
var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
var type = Encoding.UTF8.GetString(br.ReadBytes(4));
var content = br.ReadBytes(length);
var crc = br.ReadInt32();
/*var crc = */br.ReadInt32();
using (var ms = new MemoryStream(content))
using (var cr = new BinaryReader(ms))
@@ -59,7 +59,7 @@ namespace OpenRA.FileFormats.Graphics
var bitDepth = cr.ReadByte();
var colorType = (PngColorType)cr.ReadByte();
var compression = cr.ReadByte();
var filter = cr.ReadByte();
/*var filter = */cr.ReadByte();
var interlace = cr.ReadByte();
if (compression != 0) throw new InvalidDataException("Compression method not supported");
@@ -102,8 +102,8 @@ namespace OpenRA.FileFormats.Graphics
using (var ns = new MemoryStream(data.ToArray()))
{
// 'zlib' flags bytes; confuses the DeflateStream.
var flags = (byte)ns.ReadByte();
var moreFlags = (byte)ns.ReadByte();
/*var flags = (byte)*/ns.ReadByte();
/*var moreFlags = (byte)*/ns.ReadByte();
using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
using (var dr = new BinaryReader(ds))

2
OpenRA.FileFormats/Primitives/Lazy.cs
View File

@@ -40,7 +40,9 @@ namespace OpenRA.FileFormats
public void Force()
{
#pragma warning disable 0168
var ignored = Value;
#pragma warning restore 0168
}
}

3
OpenRA.Game/UiOverlay.cs
View File

@@ -16,13 +16,12 @@ namespace OpenRA
{
public class UiOverlay
{
Sprite buildOk, buildBlocked, unitDebug;
Sprite buildOk, buildBlocked;
public UiOverlay()
{
buildOk = SynthesizeTile(0x0f);
buildBlocked = SynthesizeTile(0x08);
unitDebug = SynthesizeTile(0x04);
}
public static Sprite SynthesizeTile(byte paletteIndex)

2
OpenRA.Mods.Cnc/Missions/CncShellmapScript.cs
View File

@@ -24,11 +24,9 @@ namespace OpenRA.Mods.RA
{
Dictionary<string, Actor> Actors;
static int2 ViewportOrigin;
Map Map;
public void WorldLoaded(World w)
{
Map = w.Map;
var b = w.Map.Bounds;
ViewportOrigin = new int2(b.Left + b.Width/2, b.Top + b.Height/2);
Game.MoveViewport(ViewportOrigin);

2
OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
View File

@@ -28,11 +28,9 @@ namespace OpenRA.Mods.Cnc
{
Dictionary<string, Actor> Actors;
Dictionary<string, Player> Players;
Map Map;
public void WorldLoaded(World w)
{
Map = w.Map;
Players = w.players.Values.ToDictionary(p => p.InternalName);
Actors = w.WorldActor.Trait<SpawnMapActors>().Actors;
var b = w.Map.Bounds;

2
OpenRA.Mods.RA/Effects/CashTick.cs
View File

@@ -18,7 +18,6 @@ namespace OpenRA.Mods.RA.Effects
class CashTick : IEffect
{
string s;
int lifetime;
int remaining;
int velocity;
float2 pos;
@@ -27,7 +26,6 @@ namespace OpenRA.Mods.RA.Effects
public CashTick(int value, int lifetime, int velocity, float2 pos, Color color)
{
this.color = color;
this.lifetime = lifetime;
this.velocity = velocity;
s = "{0}${1}".F(value < 0 ? "-" : "+", value);
this.pos = pos - 0.5f*Game.Renderer.TinyBoldFont.Measure(s).ToFloat2();

11
OpenRA.Mods.RA/Effects/SatelliteLaunch.cs
View File

@@ -18,15 +18,13 @@ namespace OpenRA.Mods.RA.Effects
class SatelliteLaunch : IEffect
{
int frame = 0;
Actor a;
Animation doors = new Animation("atek");
float2 doorOffset = new float2(-4,0);
int2 pos;
float2 pos;
public SatelliteLaunch(Actor a)
{
this.a = a;
pos = a.CenterLocation;
pos = a.CenterLocation - .5f * doors.Image.size + doorOffset;
doors.PlayThen("active",
() => a.World.AddFrameEndTask(w => w.Remove(this)));
}
@@ -37,14 +35,13 @@ namespace OpenRA.Mods.RA.Effects
if (++frame == 19)
{
world.AddFrameEndTask(w => w.Add(new GpsSatellite(pos - .5f * doors.Image.size + doorOffset)));
world.AddFrameEndTask(w => w.Add(new GpsSatellite(pos)));
}
}
public IEnumerable<Renderable> Render()
{
yield return new Renderable(doors.Image,
pos - .5f * doors.Image.size + doorOffset, "effect", (int)doorOffset.Y);
yield return new Renderable(doors.Image, pos, "effect", (int)doorOffset.Y);
}
}
}

4
OpenRA.Mods.RA/SupplyTruck.cs
View File

@@ -25,11 +25,9 @@ namespace OpenRA.Mods.RA
class SupplyTruck : IIssueOrder, IResolveOrder, IOrderVoice
{
int payload;
SupplyTruckInfo Info;
public SupplyTruck(SupplyTruckInfo info)
{
payload = info.Payload;
Info = info;
}
@@ -58,7 +56,7 @@ namespace OpenRA.Mods.RA
self.SetTargetLine(Target.FromOrder(order), Color.Yellow);
self.CancelActivity();
self.QueueActivity(new Enter(order.TargetActor));
self.QueueActivity(new DonateSupplies(order.TargetActor, payload));
self.QueueActivity(new DonateSupplies(order.TargetActor, Info.Payload));
}
}

2
OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs
View File

@@ -30,8 +30,8 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
return true;
};
var installed = Rules.Music.Count(m => m.Value.Exists) > 1;
/*
var installed = Rules.Music.Count(m => m.Value.Exists) > 1;
// Hack around some mix packages including hellmarch for ra
bg.GetWidget("BUTTON_INSTALL").IsVisible = () => !installed;
bg.GetWidget("BUTTON_INSTALL").OnMouseUp = mi => {

5
OpenRA.TilesetBuilder/Form1.cs
View File

@@ -121,7 +121,7 @@ namespace OpenRA.TilesetBuilder
// Create a Tileset definition
// Todo: Pull this info from the gui
var tilesetFile = "tileset-arrakis.yaml";
var mixFile = "arrakis.mix";
//var mixFile = "arrakis.mix";
var tileset = new TileSet()
{
Name = "Arrakis",
@@ -177,12 +177,13 @@ namespace OpenRA.TilesetBuilder
tileset.Save(Path.Combine(dir, tilesetFile));
throw new NotImplementedException("NotI");
//PackageWriter.CreateMix(Path.Combine(dir, mixFile),fileList);
/*
// Cleanup
foreach (var file in fileList)
File.Delete(file);
Console.WriteLine("Finished export");
*/
}
string ExportPalette(List<Color> p, string file)