From 7b5f000ba0fe30c34bcd2a9a733716e8b5c17eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 4 Jul 2014 17:11:56 +0200 Subject: [PATCH] stop pretending this is configurable and use MoveTo fixes #5682 --- OpenRA.Mods.RA/Production.cs | 3 +-- OpenRA.Mods.RA/RallyPoint.cs | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/Production.cs b/OpenRA.Mods.RA/Production.cs index 701577f670..5f15a038e4 100755 --- a/OpenRA.Mods.RA/Production.cs +++ b/OpenRA.Mods.RA/Production.cs @@ -64,7 +64,6 @@ namespace OpenRA.Mods.RA var exitLocation = rp.Value != null ? rp.Value.rallyPoint : exit; var target = Target.FromCell(self.World, exitLocation); - var nearEnough = rp.Value != null ? WRange.FromCells(rp.Value.nearEnough) : WRange.Zero; self.World.AddFrameEndTask(w => { @@ -88,7 +87,7 @@ namespace OpenRA.Mods.RA { newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit)); newUnit.QueueActivity(new AttackMove.AttackMoveActivity( - newUnit, move.MoveWithinRange(target, nearEnough))); + newUnit, move.MoveTo(exitLocation, 1))); } } diff --git a/OpenRA.Mods.RA/RallyPoint.cs b/OpenRA.Mods.RA/RallyPoint.cs index 56f3b361d3..24289b0167 100644 --- a/OpenRA.Mods.RA/RallyPoint.cs +++ b/OpenRA.Mods.RA/RallyPoint.cs @@ -25,7 +25,6 @@ namespace OpenRA.Mods.RA public class RallyPoint : IIssueOrder, IResolveOrder, ISync { [Sync] public CPos rallyPoint; - public int nearEnough = 1; public RallyPoint(Actor self, RallyPointInfo info) {