From fece294cc6b8b83a7fbf9f397582e0ef7d68ebbd Mon Sep 17 00:00:00 2001
From: Bob <ytinasni@gmail.com>
Date: Sat, 23 Oct 2010 20:54:46 +1300
Subject: [PATCH] move RemoveSelf activity into Mods/

---
 OpenRA.Game/OpenRA.Game.csproj                |  1 -
 OpenRA.Mods.Cnc/Missions/Gdi01Script.cs       | 24 +++++++++----------
 .../Activities/RemoveSelf.cs                  |  4 +++-
 OpenRA.Mods.RA/Mine.cs                        |  1 +
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj          |  1 +
 5 files changed, 17 insertions(+), 14 deletions(-)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Activities/RemoveSelf.cs (86%)
 mode change 100644 => 100755

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 860813ba42..fc03f4333e 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -130,7 +130,6 @@
     <Compile Include="Graphics\LineRenderer.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
     <Compile Include="Traits\Activities\Idle.cs" />
-    <Compile Include="Traits\Activities\RemoveSelf.cs" />
     <Compile Include="Traits\Activities\Sell.cs" />
     <Compile Include="Orders\IOrderGenerator.cs" />
     <Compile Include="Player.cs" />
diff --git a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
index 7080965c39..551953f4d4 100644
--- a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
+++ b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
@@ -6,19 +6,19 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Traits;
-using OpenRA.Widgets;
-using OpenRA.Traits.Activities;
-using OpenRA.FileFormats;
-using OpenRA;
-using OpenRA.Mods.RA.Activities;
-using System;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA;
+using OpenRA.FileFormats;
 using OpenRA.Mods.RA;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Move;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
+using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Cnc
 {
diff --git a/OpenRA.Game/Traits/Activities/RemoveSelf.cs b/OpenRA.Mods.RA/Activities/RemoveSelf.cs
old mode 100644
new mode 100755
similarity index 86%
rename from OpenRA.Game/Traits/Activities/RemoveSelf.cs
rename to OpenRA.Mods.RA/Activities/RemoveSelf.cs
index cff8b64727..8496b81f46
--- a/OpenRA.Game/Traits/Activities/RemoveSelf.cs
+++ b/OpenRA.Mods.RA/Activities/RemoveSelf.cs
@@ -8,7 +8,9 @@
  */
 #endregion
 
-namespace OpenRA.Traits.Activities
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Activities
 {
 	public class RemoveSelf : CancelableActivity
 	{
diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs
index 74b45523a4..511c381f45 100644
--- a/OpenRA.Mods.RA/Mine.cs
+++ b/OpenRA.Mods.RA/Mine.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 572f7a4392..371f8b924c 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -73,6 +73,7 @@
     <Compile Include="Activities\Leap.cs" />
     <Compile Include="Activities\MoveAdjacentTo.cs" />
     <Compile Include="Activities\Rearm.cs" />
+    <Compile Include="Activities\RemoveSelf.cs" />
     <Compile Include="Activities\Repair.cs" />
     <Compile Include="Activities\ReturnToBase.cs" />
     <Compile Include="Activities\Teleport.cs" />