From c3a0d129a39869e38a4fa89f01f87f2747d5de90 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 4 Aug 2018 23:09:21 +0200 Subject: [PATCH] Generalize FlyCircle activity Aircraft caching naming To make a possible future merger (or inheritance or other code-sharing) of these activities easier. --- OpenRA.Mods.Common/Activities/Air/FlyCircle.cs | 12 ++++++------ .../Activities/Air/HeliFlyCircle.cs | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs b/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs index 507fc86eaa..775d0dd91d 100644 --- a/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs +++ b/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs @@ -16,21 +16,21 @@ namespace OpenRA.Mods.Common.Activities { public class FlyCircle : Activity { - readonly Aircraft plane; + readonly Aircraft aircraft; readonly WDist cruiseAltitude; int remainingTicks; public FlyCircle(Actor self, int ticks = -1) { - plane = self.Trait(); - cruiseAltitude = plane.Info.CruiseAltitude; + aircraft = self.Trait(); + cruiseAltitude = aircraft.Info.CruiseAltitude; remainingTicks = ticks; } public override Activity Tick(Actor self) { // Refuse to take off if it would land immediately again. - if (plane.ForceLanding) + if (aircraft.ForceLanding) { Cancel(self); return NextActivity; @@ -45,8 +45,8 @@ namespace OpenRA.Mods.Common.Activities return NextActivity; // We can't possibly turn this fast - var desiredFacing = plane.Facing + 64; - Fly.FlyToward(self, plane, desiredFacing, cruiseAltitude); + var desiredFacing = aircraft.Facing + 64; + Fly.FlyToward(self, aircraft, desiredFacing, cruiseAltitude); return this; } diff --git a/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs b/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs index a60df97468..558ce44030 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs @@ -17,17 +17,17 @@ namespace OpenRA.Mods.Common.Activities { public class HeliFlyCircle : Activity { - readonly Aircraft helicopter; + readonly Aircraft aircraft; public HeliFlyCircle(Actor self) { - helicopter = self.Trait(); + aircraft = self.Trait(); } public override Activity Tick(Actor self) { // Refuse to take off if it would land immediately again. - if (helicopter.ForceLanding) + if (aircraft.ForceLanding) { Cancel(self); return NextActivity; @@ -36,14 +36,14 @@ namespace OpenRA.Mods.Common.Activities if (IsCanceled) return NextActivity; - if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude)) + if (HeliFly.AdjustAltitude(self, aircraft, aircraft.Info.CruiseAltitude)) return this; - var move = helicopter.FlyStep(helicopter.Facing); - helicopter.SetPosition(self, helicopter.CenterPosition + move); + var move = aircraft.FlyStep(aircraft.Facing); + aircraft.SetPosition(self, aircraft.CenterPosition + move); - var desiredFacing = helicopter.Facing + 64; - helicopter.Facing = Util.TickFacing(helicopter.Facing, desiredFacing, helicopter.TurnSpeed / 3); + var desiredFacing = aircraft.Facing + 64; + aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.TurnSpeed / 3); return this; }