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/Wait.cs
+++ b/OpenRA.Mods.RA/Activities/Wait.cs
@@ -27,15 +27,16 @@ namespace OpenRA.Mods.RA.Activities
 		
 		public override Activity Tick(Actor self)
 		{
-			if (remainingTicks-- == 0) return NextActivity;
-			return this;
+			return (remainingTicks-- == 0) ? NextActivity: this;
 		}

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