Move 'Activity' into its own namespace in OpenRA.Game.

OpenRA.Game/Activities/Activity.cs

@@ -0,0 +1,54 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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.Collections.Generic;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Activities
+{
+	public abstract class Activity
+	{
+		public Activity NextActivity { get; set; }
+		protected bool IsCanceled { get; private set; }
+
+		public abstract Activity Tick(Actor self);
+
+		public virtual void Cancel(Actor self)
+		{
+			IsCanceled = true;
+			NextActivity = null;
+		}
+
+		public virtual void Queue(Activity activity)
+		{
+			if (NextActivity != null)
+				NextActivity.Queue(activity);
+			else
+				NextActivity = activity;
+		}
+
+		public virtual IEnumerable<Target> GetTargets(Actor self)
+		{
+			yield break;
+		}
+	}
+
+	public static class ActivityExts
+	{
+		public static IEnumerable<Target> GetTargetQueue(this Actor self)
+		{
+			return self.GetCurrentActivity()
+				.Iterate(u => u.NextActivity)
+				.TakeWhile(u => u != null)
+				.SelectMany(u => u.GetTargets(self));
+		}
+	}
+}

OpenRA.Game/Activities/CallFunc.cs

@@ -0,0 +1,39 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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;
+
+namespace OpenRA.Activities
+{
+	public class CallFunc : Activity
+	{
+		public CallFunc(Action a) { this.a = a; }
+		public CallFunc(Action a, bool interruptable)
+		{
+			this.a = a;
+			this.interruptable = interruptable;
+		}
+
+		Action a;
+		bool interruptable;
+
+		public override Activity Tick(Actor self)
+		{
+			if (a != null) a();
+			return NextActivity;
+		}
+
+		public override void Cancel(Actor self)
+		{
+			if (interruptable)
+				base.Cancel(self);
+		}
+	}
+}