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

remove some crashes

Browse Source
This commit is contained in:
Chris Forbes
2010-09-16 18:18:16 +12:00
parent f456e41a45
commit 106fbcd5af
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.RA/Activities/Demolish.cs
View File

@@ -15,26 +15,23 @@ namespace OpenRA.Mods.RA.Activities
{
class Demolish : IActivity
{
Actor target;
Target target;
public IActivity NextActivity { get; set; }
public Demolish( Actor target )
{
this.target = target;
}
public Demolish( Actor target ) { this.target = Target.FromActor(target); }
public IActivity Tick(Actor self)
{
if (target == null || target.IsDead()) return NextActivity;
if ((target.Location - self.Location).Length > 1)
if (!target.IsValid) return NextActivity;
if ((target.Actor.Location - self.Location).Length > 1)
return NextActivity;
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(25 * 2,
() => target.Kill(self))));
() => { if (target.IsValid) target.Actor.Kill(self); })));
return NextActivity;
}
public void Cancel(Actor self) { target = null; NextActivity = null; }
public void Cancel(Actor self) { target = Target.None; NextActivity = null; }
}
}