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

Abort activities when we don't know how close to move to a target.

Browse Source
This commit is contained in:
Paul Chote
2019-02-08 20:29:08 +00:00
committed by Oliver Brakmann
parent 2d4bad66ae
commit 49621bebd0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Activities/LeapAttack.cs
View File

@@ -95,7 +95,7 @@ namespace OpenRA.Mods.Cnc.Activities
if (!checkTarget.IsInRange(pos, lastVisibleMaxRange) || checkTarget.IsInRange(pos, lastVisibleMinRange)) if (!checkTarget.IsInRange(pos, lastVisibleMaxRange) || checkTarget.IsInRange(pos, lastVisibleMinRange))
{ {
if (!allowMovement) if (!allowMovement || lastVisibleMaxRange == WDist.Zero || lastVisibleMaxRange < lastVisibleMinRange)
return NextActivity; return NextActivity;
QueueChild(mobile.MoveWithinRange(target, lastVisibleMinRange, lastVisibleMaxRange, checkTarget.CenterPosition, Color.Red)); QueueChild(mobile.MoveWithinRange(target, lastVisibleMinRange, lastVisibleMaxRange, checkTarget.CenterPosition, Color.Red));

2
OpenRA.Mods.Common/Activities/Attack.cs
View File

@@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Activities
if (useLastVisibleTarget) if (useLastVisibleTarget)
{ {
// We've reached the assumed position but it is not there or we can't move any further - give up // We've reached the assumed position but it is not there or we can't move any further - give up
if (checkTarget.IsInRange(pos, lastVisibleMaximumRange) || move == null) if (checkTarget.IsInRange(pos, lastVisibleMaximumRange) || move == null || lastVisibleMaximumRange == WDist.Zero)
return NextActivity; return NextActivity;
// Move towards the last known position // Move towards the last known position

2
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -268,7 +268,7 @@ namespace OpenRA.Mods.Common.Traits
} }
// We can't move into range, so give up // We can't move into range, so give up
if (move == null) if (move == null || maxRange == WDist.Zero || maxRange < minRange)
{ {
attack.requestedTarget = Target.Invalid; attack.requestedTarget = Target.Invalid;
return NextActivity; return NextActivity;