Remove FlyCircleTimed activity

A FlyCircle overload is sufficient.
This commit is contained in:
reaperrr
2017-07-28 18:12:05 +02:00
committed by Matthias Mailänder
parent df94765eac
commit 5d58374962
4 changed files with 9 additions and 39 deletions

View File

@@ -18,11 +18,13 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Aircraft plane;
readonly WDist cruiseAltitude;
int remainingTicks;
public FlyCircle(Actor self)
public FlyCircle(Actor self, int ticks = -1)
{
plane = self.Trait<Aircraft>();
cruiseAltitude = plane.Info.CruiseAltitude;
remainingTicks = ticks;
}
public override Activity Tick(Actor self)
@@ -37,6 +39,11 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled)
return NextActivity;
if (remainingTicks > 0)
remainingTicks--;
else if (remainingTicks == 0)
return NextActivity;
// We can't possibly turn this fast
var desiredFacing = plane.Facing + 64;
Fly.FlyToward(self, plane, desiredFacing, cruiseAltitude);