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

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

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Activities
inner.Cancel(self);
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
AbortOrExit(self);
if (nextState < EnterState.Exiting)