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

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);
}
}
}