diff --git a/OpenRA.Mods.Common/Activities/Air/HeliLand.cs b/OpenRA.Mods.Common/Activities/Air/HeliLand.cs index 00d2cb1c83..65b591abe6 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliLand.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliLand.cs @@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Activities { public class HeliLand : Activity { - readonly Aircraft helicopter; + readonly Aircraft aircraft; readonly WDist landAltitude; readonly bool requireSpace; @@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Activities { this.requireSpace = requireSpace; this.landAltitude = landAltitude; - helicopter = self.Trait(); + aircraft = self.Trait(); } public override Activity Tick(Actor self) @@ -37,16 +37,16 @@ namespace OpenRA.Mods.Common.Activities if (IsCanceled) return NextActivity; - if (requireSpace && !helicopter.CanLand(self.Location)) + if (requireSpace && !aircraft.CanLand(self.Location)) return this; - if (!playedSound && helicopter.Info.LandingSound != null && !self.IsAtGroundLevel()) + if (!playedSound && aircraft.Info.LandingSound != null && !self.IsAtGroundLevel()) { - Game.Sound.Play(SoundType.World, helicopter.Info.LandingSound); + Game.Sound.Play(SoundType.World, aircraft.Info.LandingSound); playedSound = true; } - if (HeliFly.AdjustAltitude(self, helicopter, landAltitude)) + if (HeliFly.AdjustAltitude(self, aircraft, landAltitude)) return this; return NextActivity; diff --git a/OpenRA.Mods.Common/Activities/Air/Land.cs b/OpenRA.Mods.Common/Activities/Air/Land.cs index 4edf9a0290..ab4e124538 100644 --- a/OpenRA.Mods.Common/Activities/Air/Land.cs +++ b/OpenRA.Mods.Common/Activities/Air/Land.cs @@ -18,12 +18,12 @@ namespace OpenRA.Mods.Common.Activities public class Land : Activity { readonly Target target; - readonly Aircraft plane; + readonly Aircraft aircraft; public Land(Actor self, Target t) { target = t; - plane = self.Trait(); + aircraft = self.Trait(); } public override Activity Tick(Actor self) @@ -37,15 +37,15 @@ namespace OpenRA.Mods.Common.Activities var d = target.CenterPosition - self.CenterPosition; // The next move would overshoot, so just set the final position - var move = plane.FlyStep(plane.Facing); + var move = aircraft.FlyStep(aircraft.Facing); if (d.HorizontalLengthSquared < move.HorizontalLengthSquared) { - plane.SetPosition(self, target.CenterPosition); + aircraft.SetPosition(self, target.CenterPosition); return NextActivity; } var landingAlt = self.World.Map.DistanceAboveTerrain(target.CenterPosition); - Fly.FlyToward(self, plane, d.Yaw.Facing, landingAlt); + Fly.FlyToward(self, aircraft, d.Yaw.Facing, landingAlt); return this; }