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

Allow cancelling an activity without aborting the entire queue

Browse Source
This commit is contained in:
Oliver Brakmann
2017-03-05 21:43:11 +01:00
committed by Paul Chote
parent 3111b2cf9b
commit f9951f76ca
11 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/Wait.cs
View File

@@ -30,9 +30,9 @@ namespace OpenRA.Mods.Common.Activities
return (remainingTicks-- == 0) ? NextActivity : this;
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!base.Cancel(self))
if (!base.Cancel(self, keepQueue))
return false;
remainingTicks = 0;
@@ -56,9 +56,9 @@ namespace OpenRA.Mods.Common.Activities
return (f == null || f()) ? NextActivity : this;
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!base.Cancel(self))
if (!base.Cancel(self, keepQueue))
return false;
f = null;