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

OpenRA.Game/Activities/Activity.cs

@@ -10,8 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Activities
 {
 	public abstract class Activity
 	{

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);
+		}
+	}
+}

OpenRA.Game/Actor.cs

@@ -14,6 +14,7 @@ using System.Drawing;
 using System.Linq;
 using Eluant;
 using Eluant.ObjectBinding;
+using OpenRA.Activities;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Scripting;

OpenRA.Game/OpenRA.Game.csproj

@@ -81,6 +81,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Activities\Activity.cs" />
+    <Compile Include="Activities\CallFunc.cs" />
     <Compile Include="Actor.cs" />
     <Compile Include="GameRules\Warhead.cs" />
     <Compile Include="Graphics\QuadRenderer.cs" />
@@ -146,7 +148,6 @@
     <Compile Include="Support\Program.cs" />
     <Compile Include="Sync.cs" />
     <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\Activity.cs" />
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Traits\CreatesShroud.cs" />
     <Compile Include="Traits\DrawLineToTarget.cs" />

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Network;

OpenRA.Game/Traits/Util.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Support;
 
 namespace OpenRA.Traits