Fix powerdown effect + flash

This commit is contained in:
Paul Chote
2010-01-08 22:28:01 +13:00
parent ad7f188bf5
commit 840a17d255

View File

@@ -9,6 +9,9 @@ namespace OpenRa.Game.Effects
Actor a; Actor a;
Building b; Building b;
Animation anim = new Animation("powerdown"); Animation anim = new Animation("powerdown");
bool removeNextFrame = false;
bool indicatorState = true;
int stateTicks = 0;
public PowerDownIndicator(Actor a) public PowerDownIndicator(Actor a)
{ {
@@ -19,8 +22,19 @@ namespace OpenRa.Game.Effects
public void Tick() public void Tick()
{ {
if (!b.Disabled || a.IsDead) if (removeNextFrame == true)
Game.world.AddFrameEndTask(w => w.Remove(this)); Game.world.AddFrameEndTask(w => w.Remove(this));
// Fix off-by one frame bug with undisabling causing low-power
if (!b.Disabled || a.IsDead)
removeNextFrame = true;
// Flash power icon
if (++stateTicks == 15)
{
stateTicks = 0;
indicatorState = !indicatorState;
}
} }
public IEnumerable<Renderable> Render() public IEnumerable<Renderable> Render()
@@ -28,7 +42,7 @@ namespace OpenRa.Game.Effects
foreach (var r in a.Render()) foreach (var r in a.Render())
yield return r.WithPalette(PaletteType.Disabled); yield return r.WithPalette(PaletteType.Disabled);
if (b.ManuallyDisabled) if (b.ManuallyDisabled && indicatorState)
yield return new Renderable(anim.Image, yield return new Renderable(anim.Image,
a.CenterLocation - .5f * anim.Image.size, PaletteType.Chrome); a.CenterLocation - .5f * anim.Image.size, PaletteType.Chrome);
} }