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

OpenRA.Mods.Common/Activities/CallFunc.cs

@@ -1,40 +0,0 @@
-#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/Move/Drag.cs

@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities

OpenRA.Mods.Common/Activities/RemoveSelf.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Traits;
+using OpenRA.Activities;
 
 namespace OpenRA.Mods.Common.Activities
 {

OpenRA.Mods.Common/Activities/SimpleTeleport.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities

OpenRA.Mods.Common/CommonTraitsInterfaces.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Activities;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;

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

@@ -49,7 +49,6 @@
   </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" />

OpenRA.Mods.Common/Scripting/CallLuaFunc.cs

@@ -10,6 +10,7 @@
 
 using System;
 using Eluant;
+using OpenRA.Activities;
 using OpenRA.Scripting;
 using OpenRA.Traits;