From ee188ededdb8a79a95e5af46a5a93a547e21f46b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 10 Jul 2013 20:01:04 +1200 Subject: [PATCH] Fix Follow formatting. --- OpenRA.Mods.RA/Activities/Follow.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenRA.Mods.RA/Activities/Follow.cs b/OpenRA.Mods.RA/Activities/Follow.cs index eb3b414159..1c4e757e2a 100644 --- a/OpenRA.Mods.RA/Activities/Follow.cs +++ b/OpenRA.Mods.RA/Activities/Follow.cs @@ -15,8 +15,8 @@ namespace OpenRA.Mods.RA.Activities { public class Follow : Activity { - Target Target; - int Range; + Target target; + int range; int nextPathTime; const int delayBetweenPathingAttempts = 20; @@ -24,25 +24,25 @@ namespace OpenRA.Mods.RA.Activities public Follow(Target target, int range) { - Target = target; - Range = range; + this.target = target; + this.range = range; } - public override Activity Tick( Actor self ) + public override Activity Tick(Actor self) { - if (IsCanceled) return NextActivity; - if (!Target.IsValid) return NextActivity; + if (IsCanceled || !target.IsValid) + return NextActivity; - var inRange = ( Target.CenterPosition.ToCPos() - self.Location ).LengthSquared < Range * Range; + var inRange = (target.CenterPosition.ToCPos() - self.Location).LengthSquared < range * range; - if( inRange ) return this; - if (--nextPathTime > 0) return this; + if (inRange || --nextPathTime > 0) + return this; nextPathTime = self.World.SharedRandom.Next(delayBetweenPathingAttempts - delaySpread, delayBetweenPathingAttempts + delaySpread); var mobile = self.Trait(); - return Util.SequenceActivities( mobile.MoveWithinRange( Target, new WRange(1024*Range) ), this ); + return Util.SequenceActivities(mobile.MoveWithinRange(target, new WRange(1024*range)), this); } } }