Tidy up Activity.Cancel(), make Tick abstract

2011-04-16 13:18:22 +12:00
parent 0a67c68c45
commit 4f83e994d0
14 changed files with 47 additions and 54 deletions
--- a/OpenRA.Mods.RA/Activities/CallFunc.cs
+++ b/OpenRA.Mods.RA/Activities/CallFunc.cs
@@ -33,13 +33,10 @@ namespace OpenRA.Mods.RA.Activities
 			return NextActivity;
 		}

-		protected override bool OnCancel(Actor self)
+		public override void Cancel(Actor self)
 		{
-			if (!interruptable)
-				return false;
-			
-			a = null;
-			return true;
+			if (interruptable)
+				base.Cancel(self);
 		}
 	}
 }