Replaced Canceled state with Canceling state.

2019-03-03 01:57:17 +01:00
parent 8191a6566b
commit a17cd0fa06
43 changed files with 74 additions and 108 deletions
--- a/OpenRA.Mods.Common/Activities/Attack.cs
+++ b/OpenRA.Mods.Common/Activities/Attack.cs
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.Activities

 		public override Activity Tick(Actor self)
 		{
-			if (IsCanceled)
+			if (IsCanceling)
 				return NextActivity;

 			bool targetIsHiddenActor;
@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Activities

 		protected virtual AttackStatus TickAttack(Actor self, AttackFrontal attack)
 		{
-			if (IsCanceled)
+			if (IsCanceling)
 				return AttackStatus.UnableToAttack;

 			if (!target.IsValidFor(self))