epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop pretending this is configurable and use MoveTo

Browse Source 
fixes #5682
This commit is contained in:
Matthias Mailänder
2014-07-04 17:11:56 +02:00
parent 4fed3371d0
commit 7b5f000ba0
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Production.cs
View File

@@ -64,7 +64,6 @@ namespace OpenRA.Mods.RA
var exitLocation = rp.Value != null ? rp.Value.rallyPoint : exit; var exitLocation = rp.Value != null ? rp.Value.rallyPoint : exit;
var target = Target.FromCell(self.World, exitLocation); var target = Target.FromCell(self.World, exitLocation);
var nearEnough = rp.Value != null ? WRange.FromCells(rp.Value.nearEnough) : WRange.Zero;
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
@@ -88,7 +87,7 @@ namespace OpenRA.Mods.RA
{ {
newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit)); newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit));
newUnit.QueueActivity(new AttackMove.AttackMoveActivity( newUnit.QueueActivity(new AttackMove.AttackMoveActivity(
newUnit, move.MoveWithinRange(target, nearEnough))); newUnit, move.MoveTo(exitLocation, 1)));
} }
} }

1
OpenRA.Mods.RA/RallyPoint.cs
View File

@@ -25,7 +25,6 @@ namespace OpenRA.Mods.RA
public class RallyPoint : IIssueOrder, IResolveOrder, ISync public class RallyPoint : IIssueOrder, IResolveOrder, ISync
{ {
[Sync] public CPos rallyPoint; [Sync] public CPos rallyPoint;
public int nearEnough = 1;
public RallyPoint(Actor self, RallyPointInfo info) public RallyPoint(Actor self, RallyPointInfo info)
{ {