refactor activity queueing

OpenRA.Mods.RA/Activities/FlyAttack.cs

@@ -12,15 +12,15 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
-	public class FlyAttack : IActivity
+	public class FlyAttack : CancelableActivity
 	{
-		public IActivity NextActivity { get; set; }
 		Target Target;
 
 		public FlyAttack(Target target) { Target = target; }
 
-		public IActivity Tick(Actor self)
+		public override IActivity Tick(Actor self)
 		{
+			if (IsCanceled) return NextActivity;
 			if (!Target.IsValid)
 				return NextActivity;
 
@@ -33,29 +33,22 @@ namespace OpenRA.Mods.RA.Activities
 				new FlyTimed(50),
 				this);
 		}
-
-		public void Cancel(Actor self) { Target = Target.None; NextActivity = null; }
 	}
 
-	public class FlyCircle : IActivity
+	public class FlyCircle : CancelableActivity
 	{
-		public IActivity NextActivity { get; set; }
 		int2 Target;
-		bool isCanceled;
 
 		public FlyCircle(int2 target) { Target = target; }
 
-		public IActivity Tick(Actor self)
+		public override IActivity Tick(Actor self)
 		{
-			if (isCanceled)
-				return NextActivity;
+			if( IsCanceled ) return NextActivity;
 
 			return Util.SequenceActivities(
 				new Fly(Util.CenterOfCell(Target)),
 				new FlyTimed(50),
 				this);
 		}
-
-		public void Cancel(Actor self) { isCanceled = true; NextActivity = null; }
 	}
 }