more of attack-ground (order wiring, etc); doesn't work.

This commit is contained in:
Chris Forbes
2010-07-07 20:46:19 +12:00
parent 5c61c9d3a9
commit 73b6eb568b
12 changed files with 62 additions and 41 deletions

View File

@@ -15,10 +15,10 @@ namespace OpenRA.Mods.RA.Activities
{
public class Follow : IActivity
{
Actor Target;
Target Target;
int Range;
public Follow(Actor target, int range)
public Follow(Target target, int range)
{
Target = target;
Range = range;
@@ -28,10 +28,10 @@ namespace OpenRA.Mods.RA.Activities
public IActivity Tick( Actor self )
{
if (Target == null || Target.IsDead)
if (!Target.IsValid)
return NextActivity;
var inRange = ( Target.Location - self.Location ).LengthSquared < Range * Range;
var inRange = ( Util.CellContaining( Target.CenterLocation ) - self.Location ).LengthSquared < Range * Range;
if( !inRange )
return new Move( Target, Range ) { NextActivity = this };
@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Activities
public void Cancel(Actor self)
{
Target = null;
Target = Target.None;
}
}
}