diff --git a/OpenRA.Mods.Common/Activities/Air/FlyFollow.cs b/OpenRA.Mods.Common/Activities/Air/FlyFollow.cs index 19545e438c..0f0b41d023 100644 --- a/OpenRA.Mods.Common/Activities/Air/FlyFollow.cs +++ b/OpenRA.Mods.Common/Activities/Air/FlyFollow.cs @@ -18,14 +18,14 @@ namespace OpenRA.Mods.Common.Activities public class FlyFollow : Activity { Target target; - Aircraft plane; + Aircraft aircraft; WDist minRange; WDist maxRange; public FlyFollow(Actor self, Target target, WDist minRange, WDist maxRange) { this.target = target; - plane = self.Trait(); + aircraft = self.Trait(); this.minRange = minRange; this.maxRange = maxRange; } @@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Activities 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; @@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Activities if (target.IsInRange(self.CenterPosition, maxRange) && !target.IsInRange(self.CenterPosition, minRange)) { - Fly.FlyToward(self, plane, plane.Facing, plane.Info.CruiseAltitude); + Fly.FlyToward(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude); return this; } diff --git a/OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs b/OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs index 50bd72faa3..9a22eb688c 100644 --- a/OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs +++ b/OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs @@ -16,17 +16,17 @@ namespace OpenRA.Mods.Common.Activities { public class FlyOffMap : Activity { - readonly Aircraft plane; + readonly Aircraft aircraft; public FlyOffMap(Actor self) { - plane = self.Trait(); + aircraft = self.Trait(); } 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; @@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Activities if (IsCanceled || !self.World.Map.Contains(self.Location)) return NextActivity; - Fly.FlyToward(self, plane, plane.Facing, plane.Info.CruiseAltitude); + Fly.FlyToward(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude); return this; } } diff --git a/OpenRA.Mods.Common/Activities/Air/FlyTimed.cs b/OpenRA.Mods.Common/Activities/Air/FlyTimed.cs index c6b8173d00..d904d6dcb4 100644 --- a/OpenRA.Mods.Common/Activities/Air/FlyTimed.cs +++ b/OpenRA.Mods.Common/Activities/Air/FlyTimed.cs @@ -16,21 +16,21 @@ namespace OpenRA.Mods.Common.Activities { public class FlyTimed : Activity { - readonly Aircraft plane; + readonly Aircraft aircraft; readonly WDist cruiseAltitude; int remainingTicks; public FlyTimed(int ticks, Actor self) { remainingTicks = ticks; - plane = self.Trait(); - cruiseAltitude = plane.Info.CruiseAltitude; + aircraft = self.Trait(); + cruiseAltitude = aircraft.Info.CruiseAltitude; } 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; @@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Activities if (IsCanceled || remainingTicks-- == 0) return NextActivity; - Fly.FlyToward(self, plane, plane.Facing, cruiseAltitude); + Fly.FlyToward(self, aircraft, aircraft.Facing, cruiseAltitude); return this; }