Kill QueuedActivity

OpenRA.Mods.RA/Activities/QueuedActivity.cs

@@ -1,47 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-
-namespace OpenRA.Mods.RA.Activities
-{
-	public class QueuedActivity : Activity
-	{
-		public QueuedActivity(Action<QueuedActivity> a) { this.a = a; }
-
-		public QueuedActivity(Action<QueuedActivity> a, bool interruptable)
-		{
-			this.a = a;
-		}
-
-		Action<QueuedActivity> a;
-
-		public override Activity Tick(Actor self) { return Run(self); }
-
-		public Activity Run(Actor self)
-		{
-			if (a != null)
-				a(this);
-
-			return NextActivity;
-		}
-
-		public void Insert( Activity activity )
-		{
-			if (activity == null)
-				return;
-			activity.Queue(NextActivity);
-			NextActivity = activity;
-		}
-	}
-}

OpenRA.Mods.RA/Move/Mobile.cs

@@ -247,29 +247,31 @@ namespace OpenRA.Mods.RA.Move
             return target;
         }
 		
+		void PerformMoveInner(Actor self, int2 targetLocation, bool queued)
+		{
+			int2 currentLocation = NearestMoveableCell(targetLocation);
+
+            if (!CanEnterCell(currentLocation))
+            {
+                if (queued) self.CancelActivity();
+                return;
+            }
+
+            if (!queued) self.CancelActivity();
+
+            ticksBeforePathing = avgTicksBeforePathing + self.World.SharedRandom.Next(-spreadTicksBeforePathing, spreadTicksBeforePathing);
+
+            self.QueueActivity(new Move(currentLocation, 8));
+
+            self.SetTargetLine(Target.FromCell(currentLocation), Color.Green);
+		}
+		
         protected void PerformMove(Actor self, int2 targetLocation, bool queued)
         {
-            var ph = new QueuedActivity(
+            if (queued)
-                (qa) =>
+				self.QueueActivity(new CallFunc(() => PerformMoveInner(self, targetLocation, queued)));
-                {
+			else
-                    int2 currentLocation = NearestMoveableCell(targetLocation);
+				PerformMoveInner(self, targetLocation, queued);
-
-                    if (!CanEnterCell(currentLocation))
-                    {
-                        if (queued) self.CancelActivity();
-                        return;
-                    }
-
-                    if (!queued) self.CancelActivity();
-
-                    ticksBeforePathing = avgTicksBeforePathing + self.World.SharedRandom.Next(-spreadTicksBeforePathing, spreadTicksBeforePathing);
-
-                    qa.Insert(new Move(currentLocation, 8));
-
-                    self.SetTargetLine(Target.FromCell(currentLocation), Color.Green);
-                });
-
-            self.QueueActivity(queued ? ph : ph.Run(self));
         }
 
         public void ResolveOrder(Actor self, Order order)

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -56,7 +56,6 @@
     <Compile Include="Activities\Attack.cs" />
     <Compile Include="Activities\CallFunc.cs" />
     <Compile Include="Activities\DonateSupplies.cs" />
-    <Compile Include="Activities\QueuedActivity.cs" />
     <Compile Include="Activities\DeliverOre.cs" />
     <Compile Include="Activities\Demolish.cs" />
     <Compile Include="Activities\Enter.cs" />