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

Don’t cancel MoveAdjacentTo / MoveWithinRange when target becomes invalid.

Browse Source 
Move to the last known position instead.  Fixes #5968.
This commit is contained in:
Paul Chote
2014-07-18 23:17:50 +12:00
parent 312041b9c8
commit e805461be7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
View File

@@ -17,12 +17,12 @@ namespace OpenRA.Mods.RA.Activities
{ {
public class MoveAdjacentTo : Activity public class MoveAdjacentTo : Activity
{ {
protected readonly Target target;
readonly Mobile mobile; readonly Mobile mobile;
readonly PathFinder pathFinder; readonly PathFinder pathFinder;
readonly DomainIndex domainIndex; readonly DomainIndex domainIndex;
readonly uint movementClass; readonly uint movementClass;
protected Target target { get; private set; }
protected CPos targetPosition; protected CPos targetPosition;
Activity inner; Activity inner;
bool repath; bool repath;
@@ -87,10 +87,8 @@ namespace OpenRA.Mods.RA.Activities
} }
else else
{ {
// Target became invalid. Cancel the inner order, // Target became invalid. Move to its last known position.
// and then wait for it to move into the next cell target = Target.FromCell(self.World, targetPosition);
// before finishing this order (handled above).
inner.Cancel(self);
} }
// Ticks the inner move activity to actually move the actor. // Ticks the inner move activity to actually move the actor.