Move Activities CallFunc, RemoveSelf and SimpleTeleport to Common

OpenRA.Mods.Common/Activities/CallFunc.cs

@@ -0,0 +1,40 @@
+#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;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.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);
+		}
+	}
+}

OpenRA.Mods.Common/Activities/RemoveSelf.cs

@@ -0,0 +1,24 @@
+#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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Activities
+{
+	public class RemoveSelf : Activity
+	{
+		public override Activity Tick(Actor self)
+		{
+			if (IsCanceled) return NextActivity;
+			self.Destroy();
+			return null;
+		}
+	}
+}

OpenRA.Mods.Common/Activities/SimpleTeleport.cs

@@ -0,0 +1,28 @@
+#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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Activities
+{
+	public class SimpleTeleport : Activity
+	{
+		CPos destination;
+
+		public SimpleTeleport(CPos destination) { this.destination = destination; }
+
+		public override Activity Tick(Actor self)
+		{
+			self.Trait<IPositionable>().SetPosition(self, destination);
+			self.Generation++;
+			return NextActivity;
+		}
+	}
+}

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -49,6 +49,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activities\Move\Drag.cs" />
+    <Compile Include="Activities\CallFunc.cs" />
+    <Compile Include="Activities\RemoveSelf.cs" />
+    <Compile Include="Activities\SimpleTeleport.cs" />
     <Compile Include="CommonTraitsInterfaces.cs" />
     <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Effects\Bullet.cs" />