diff --git a/OpenRA.Mods.Common/Activities/Move/Move.cs b/OpenRA.Mods.Common/Activities/Move/Move.cs index 072d665194..2b86c6cc47 100644 --- a/OpenRA.Mods.Common/Activities/Move/Move.cs +++ b/OpenRA.Mods.Common/Activities/Move/Move.cs @@ -198,12 +198,6 @@ namespace OpenRA.Mods.Common.Activities if (path == null) { - if (mobile.TicksBeforePathing > 0) - { - --mobile.TicksBeforePathing; - return this; - } - path = EvalPath(); SanityCheckPath(mobile); } @@ -315,12 +309,6 @@ namespace OpenRA.Mods.Common.Activities if (--waitTicksRemaining >= 0) return null; - if (mobile.TicksBeforePathing > 0) - { - --mobile.TicksBeforePathing; - return null; - } - // Calculate a new path mobile.RemoveInfluence(); var newPath = EvalPath(); diff --git a/OpenRA.Mods.Common/Traits/Mobile.cs b/OpenRA.Mods.Common/Traits/Mobile.cs index d7c1bd96d9..e267500c70 100644 --- a/OpenRA.Mods.Common/Traits/Mobile.cs +++ b/OpenRA.Mods.Common/Traits/Mobile.cs @@ -91,10 +91,6 @@ namespace OpenRA.Mods.Common.Traits public class Mobile : ConditionalTrait, INotifyCreated, IIssueOrder, IResolveOrder, IOrderVoice, IPositionable, IMove, IFacing, IDeathActorInitModifier, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove, IActorPreviewInitModifier, INotifyBecomingIdle { - const int AverageTicksBeforePathing = 5; - const int SpreadTicksBeforePathing = 5; - internal int TicksBeforePathing = 0; - readonly Actor self; readonly Lazy> speedModifiers; @@ -643,8 +639,6 @@ namespace OpenRA.Mods.Common.Traits if (!order.Queued) self.CancelActivity(); - TicksBeforePathing = AverageTicksBeforePathing + self.World.SharedRandom.Next(-SpreadTicksBeforePathing, SpreadTicksBeforePathing); - self.SetTargetLine(Target.FromCell(self.World, loc), Color.Green); self.QueueActivity(order.Queued, new Move(self, loc, WDist.FromCells(8), null, true)); }