Allow cancelling an activity without aborting the entire queue

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

View File

@@ -207,7 +207,7 @@ namespace OpenRA.Mods.Common.Activities
});
}
public override bool Cancel(Actor self)
public override bool Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceled && innerActivity != null && !innerActivity.Cancel(self))
return false;