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

Replaced Canceled state with Canceling state.

Browse Source
This commit is contained in:
tovl
2019-03-03 01:57:17 +01:00
committed by Paul Chote
parent 8191a6566b
commit a17cd0fa06
43 changed files with 74 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ namespace OpenRA.Mods.Common.Traits
public override Activity Tick(Actor self)
{
if (IsCanceled)
if (IsCanceling)
{
// Cancel the requested target, but keep firing on it while in range
attack.opportunityTarget = attack.requestedTarget;

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

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
// This activity can't move to reacquire hidden targets, so use the
// Recalculate overload that invalidates hidden targets.
target = target.RecalculateInvalidatingHiddenTargets(self.Owner);
if (IsCanceled || !target.IsValidFor(self) || !attack.IsReachableTarget(target, allowMove))
if (IsCanceling || !target.IsValidFor(self) || !attack.IsReachableTarget(target, allowMove))
return NextActivity;
attack.DoAttack(self, target);