From 9215fa4d28d22557ae65468f1354e83a9239298a Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 20 May 2010 19:14:16 +1200
Subject: [PATCH] moved CallFunc, Wait activities to ra

---
 OpenRA.Game/OpenRA.Game.csproj                |  5 ---
 OpenRA.Game/Traits/Activities/Move.cs         |  2 -
 OpenRA.Game/Traits/Activities/Wait.cs         | 32 ---------------
 .../Activities/CallFunc.cs                    |  3 +-
 OpenRA.Mods.RA/Activities/Wait.cs             | 40 +++++++++++++++++++
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj          |  2 +
 6 files changed, 44 insertions(+), 40 deletions(-)
 delete mode 100644 OpenRA.Game/Traits/Activities/Wait.cs
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Activities/CallFunc.cs (92%)
 create mode 100644 OpenRA.Mods.RA/Activities/Wait.cs

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 5b7ad70e6a..ae6ea925d3 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -145,7 +145,6 @@
     <Compile Include="Traits\World\ChoosePaletteOnSelect.cs" />
     <Compile Include="Traits\World\Country.cs" />
     <Compile Include="Traits\Activities\Attack.cs" />
-    <Compile Include="Traits\Activities\CallFunc.cs" />
     <Compile Include="Traits\Activities\TransformIntoActor.cs" />
     <Compile Include="Actor.cs" />
     <Compile Include="Effects\Bullet.cs" />
@@ -239,7 +238,6 @@
     <Compile Include="Widgets\BackgroundWidget.cs" />
     <Compile Include="Widgets\LabelWidget.cs" />
     <Compile Include="Widgets\CheckboxWidget.cs" />
-    <Compile Include="Traits\Activities\Wait.cs" />
     <Compile Include="Traits\World\GlobalDefaults.cs" />
     <Compile Include="Traits\World\BibLayer.cs" />
     <Compile Include="Traits\World\SmudgeLayer.cs" />
@@ -279,9 +277,6 @@
   <ItemGroup>
     <Content Include="OpenRA.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Traits\AI\" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OpenRA.Game/Traits/Activities/Move.cs b/OpenRA.Game/Traits/Activities/Move.cs
index 775492f40a..d37034965c 100755
--- a/OpenRA.Game/Traits/Activities/Move.cs
+++ b/OpenRA.Game/Traits/Activities/Move.cs
@@ -22,8 +22,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Drawing;
-using OpenRA.GameRules;
 
 namespace OpenRA.Traits.Activities
 {
diff --git a/OpenRA.Game/Traits/Activities/Wait.cs b/OpenRA.Game/Traits/Activities/Wait.cs
deleted file mode 100644
index c95d99785f..0000000000
--- a/OpenRA.Game/Traits/Activities/Wait.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-
-using System;
-
-namespace OpenRA.Traits.Activities
-{
-
-	public class Wait: IActivity	
-	{
-	int remainingTicks;
-		
-		public Wait (int period) 
-		{
-			remainingTicks = period;
-		}
-		
-		public IActivity Tick (Actor self)
-		{
-			if (remainingTicks-- == 0) return NextActivity;
-			return this;
-		}
-		
-		
-		public void Cancel (Actor self)
-		{
-			remainingTicks = 0; NextActivity = null;
-		}
-		
-		
-		public IActivity NextActivity { get; set; }
-
-	}
-}
diff --git a/OpenRA.Game/Traits/Activities/CallFunc.cs b/OpenRA.Mods.RA/Activities/CallFunc.cs
similarity index 92%
rename from OpenRA.Game/Traits/Activities/CallFunc.cs
rename to OpenRA.Mods.RA/Activities/CallFunc.cs
index 51e5ffd5bc..1ccf27786f 100644
--- a/OpenRA.Game/Traits/Activities/CallFunc.cs
+++ b/OpenRA.Mods.RA/Activities/CallFunc.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using System;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	public class CallFunc : IActivity
 	{
diff --git a/OpenRA.Mods.RA/Activities/Wait.cs b/OpenRA.Mods.RA/Activities/Wait.cs
new file mode 100644
index 0000000000..8f5bd1b83e
--- /dev/null
+++ b/OpenRA.Mods.RA/Activities/Wait.cs
@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Activities
+{
+	public class Wait : IActivity
+	{
+		int remainingTicks;
+
+		public Wait(int period) { remainingTicks = period; }
+
+		public IActivity Tick(Actor self)
+		{
+			if (remainingTicks-- == 0) return NextActivity;
+			return this;
+		}
+
+		public void Cancel(Actor self) { remainingTicks = 0; NextActivity = null; }
+		public IActivity NextActivity { get; set; }
+	}
+}
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index a268211ea4..fc2c4a9503 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -46,6 +46,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Activities\CallFunc.cs" />
     <Compile Include="Activities\CaptureBuilding.cs" />
     <Compile Include="Activities\DeliverOre.cs" />
     <Compile Include="Activities\Demolish.cs" />
@@ -68,6 +69,7 @@
     <Compile Include="Activities\Steal.cs" />
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
+    <Compile Include="Activities\Wait.cs" />
     <Compile Include="AirstrikePower.cs" />
     <Compile Include="AttackFrontal.cs" />
     <Compile Include="AttackHeli.cs" />