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/Scripting/CallLuaFunc.cs
+++ b/OpenRA.Mods.Common/Scripting/CallLuaFunc.cs
@@ -43,9 +43,9 @@ namespace OpenRA.Mods.Common.Activities
 			return NextActivity;
 		}

-		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;

 			Dispose();