From 995a3da43a4f5134c3e18e500b75f829f4f55cf6 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 17 Jun 2017 12:54:06 +0100 Subject: [PATCH] Rename Enter.targetCenter to repathWhileMoving. --- OpenRA.Mods.Common/Activities/Enter.cs | 8 ++++---- OpenRA.Mods.Common/Activities/EnterTransport.cs | 4 ++-- .../Scripting/Properties/MobileProperties.cs | 2 +- OpenRA.Mods.Common/Traits/Passenger.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.Common/Activities/Enter.cs b/OpenRA.Mods.Common/Activities/Enter.cs index 34894fe5c9..bb8e820f99 100644 --- a/OpenRA.Mods.Common/Activities/Enter.cs +++ b/OpenRA.Mods.Common/Activities/Enter.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Activities readonly IMove move; readonly int maxTries = 0; readonly EnterBehaviour enterBehaviour; - readonly bool targetCenter; + readonly bool repathWhileMoving; public Target Target { get { return target; } } Target target; @@ -36,13 +36,13 @@ namespace OpenRA.Mods.Common.Activities Activity inner; bool firstApproach = true; - protected Enter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1, bool targetCenter = false) + protected Enter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1, bool repathWhileMoving = true) { move = self.Trait(); this.target = Target.FromActor(target); this.maxTries = maxTries; this.enterBehaviour = enterBehaviour; - this.targetCenter = targetCenter; + this.repathWhileMoving = repathWhileMoving; } // CanEnter(target) should to be true; otherwise, Enter may abort. @@ -169,7 +169,7 @@ namespace OpenRA.Mods.Common.Activities case ReserveStatus.None: return EnterState.Done; // No available target -> abort to next activity case ReserveStatus.TooFar: - inner = move.MoveToTarget(self, targetCenter ? Target.FromPos(target.CenterPosition) : target); // Approach + inner = move.MoveToTarget(self, repathWhileMoving ? target : Target.FromPos(target.CenterPosition)); // Approach return EnterState.ApproachingOrEntering; case ReserveStatus.Pending: return EnterState.ApproachingOrEntering; // Retry next tick diff --git a/OpenRA.Mods.Common/Activities/EnterTransport.cs b/OpenRA.Mods.Common/Activities/EnterTransport.cs index 1dddacf70a..32cda0e8e8 100644 --- a/OpenRA.Mods.Common/Activities/EnterTransport.cs +++ b/OpenRA.Mods.Common/Activities/EnterTransport.cs @@ -22,8 +22,8 @@ namespace OpenRA.Mods.Common.Activities Actor transport; Cargo cargo; - public EnterTransport(Actor self, Actor transport, int maxTries = 0, bool targetCenter = false) - : base(self, transport, EnterBehaviour.Exit, maxTries, targetCenter) + public EnterTransport(Actor self, Actor transport, int maxTries = 0, bool repathWhileMoving = true) + : base(self, transport, EnterBehaviour.Exit, maxTries, repathWhileMoving) { this.transport = transport; this.maxTries = maxTries; diff --git a/OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs index 7f5eb51272..f8e571e4db 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs @@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Scripting [Desc("Move to and enter the transport.")] public void EnterTransport(Actor transport) { - Self.QueueActivity(new EnterTransport(Self, transport, 1, true)); + Self.QueueActivity(new EnterTransport(Self, transport, 1, false)); } [Desc("Whether the actor can move (false if immobilized).")] diff --git a/OpenRA.Mods.Common/Traits/Passenger.cs b/OpenRA.Mods.Common/Traits/Passenger.cs index 3989e4da33..5dfdf1b7ce 100644 --- a/OpenRA.Mods.Common/Traits/Passenger.cs +++ b/OpenRA.Mods.Common/Traits/Passenger.cs @@ -107,7 +107,7 @@ namespace OpenRA.Mods.Common.Traits self.CancelActivity(); var transports = order.OrderString == "EnterTransports"; - self.QueueActivity(new EnterTransport(self, order.TargetActor, transports ? Info.MaxAlternateTransportAttempts : 0, transports)); + self.QueueActivity(new EnterTransport(self, order.TargetActor, transports ? Info.MaxAlternateTransportAttempts : 0, !transports)); } }