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

don't use Move directly

Browse Source
This commit is contained in:
Bob
2010-10-22 11:10:32 +13:00
parent f933e3de3f
commit 6513bd5fe0
20 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
*/
#endregion
using System.Linq;
using OpenRA.Effects;
using OpenRA.Traits;
@@ -15,20 +16,21 @@ namespace OpenRA.Mods.RA.Activities
{
class Demolish : CancelableActivity
{
Target target;
Actor target;
public Demolish( Actor target ) { this.target = Target.FromActor(target); }
public Demolish( Actor target ) { this.target = target; }
public override IActivity Tick(Actor self)
{
if( IsCanceled ) return NextActivity;
if (!target.IsValid) return NextActivity;
if ((target.Actor.Location - self.Location).Length > 1)
if (IsCanceled) return NextActivity;
if (target == null || !target.IsInWorld || target.IsDead()) return NextActivity;
if (target.Owner == self.Owner) return NextActivity;
if( !target.Trait<IOccupySpace>().OccupiedCells().Any( x => x == self.Location ) )
return NextActivity;
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(25 * 2,
() => { if (target.IsValid) target.Actor.Kill(self); })));
() => { if (target.IsInWorld) target.Kill(self); })));
return NextActivity;
}
}