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

Fix a crash caused by invalid target in FlyAttack

Browse Source
This commit is contained in:
tjk-ws
2024-07-06 14:11:40 -05:00
committed by Matthias Mailänder
parent 7b01204eed
commit bdc142ae51
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

@@ -141,9 +141,6 @@ namespace OpenRA.Mods.Common.Activities
var minimumRange = attackAircraft.Info.AttackType == AirAttackType.Strafe ? WDist.Zero : attackAircraft.GetMinimumRangeVersusTarget(target);
if (checkTarget.IsInRange(pos, lastVisibleMaximumRange) && !checkTarget.IsInRange(pos, minimumRange) && useLastVisibleTarget)
return true;
if (lastVisibleMaximumRange == WDist.Zero || lastVisibleMaximumRange < minimumRange)
return true;
@@ -153,8 +150,12 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(new TakeOff(self));
// Move into range of the target.
if (!target.IsInRange(pos, lastVisibleMaximumRange) || target.IsInRange(pos, minimumRange))
QueueChild(aircraft.MoveWithinRange(target, minimumRange, lastVisibleMaximumRange, target.CenterPosition, Color.Red));
if (!checkTarget.IsInRange(pos, lastVisibleMaximumRange) || checkTarget.IsInRange(pos, minimumRange))
QueueChild(aircraft.MoveWithinRange(target, minimumRange, lastVisibleMaximumRange, checkTarget.CenterPosition, Color.Red));
// We've reached the assumed position but it is not there - give up
else if (useLastVisibleTarget)
return true;
// The aircraft must keep moving forward even if it is already in an ideal position.
else if (attackAircraft.Info.AttackType == AirAttackType.Strafe)