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

6
OpenRA.Mods.Common/Activities/DeliverUnit.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
if (IsCanceled)
if (IsCanceling)
return NextActivity;
if ((carryall.State == Carryall.CarryallState.Idle || carryall.Carryable.IsDead) && state != DeliveryState.TakeOff)
@@ -208,8 +208,8 @@ namespace OpenRA.Mods.Common.Activities
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self))
return false;
if (!IsCanceling && innerActivity != null)
innerActivity.Cancel(self);
return base.Cancel(self);
}