Allow cancelling an activity without aborting the entire queue

2017-03-05 21:43:11 +01:00
parent 3111b2cf9b
commit f9951f76ca
11 changed files with 23 additions and 21 deletions
--- a/OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs
+++ b/OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs
@@ -46,12 +46,12 @@ namespace OpenRA.Mods.Common.Activities
 			return this;
 		}

-		public override bool Cancel(Actor self)
+		public override bool Cancel(Actor self, bool keepQueue = false)
 		{
 			if (!IsCanceled && inner != null && !inner.Cancel(self))
 				return false;

-			return base.Cancel(self);
+			return base.Cancel(self, keepQueue);
 		}

 		public override IEnumerable<Target> GetTargets(Actor self)