From ed21b3be8d10fe70ebeb872a59d95de6cc77fedd Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 20 May 2010 17:28:24 +1200
Subject: [PATCH] moved cargo-related traits to ra

---
 OpenRA.Game/OpenRA.Game.csproj                               | 4 ----
 OpenRA.Mods.Cnc/ProductionAirdrop.cs                         | 1 +
 .../Traits => OpenRA.Mods.RA}/Activities/EnterTransport.cs   | 4 +++-
 .../Traits => OpenRA.Mods.RA}/Activities/UnloadCargo.cs      | 4 +++-
 {OpenRA.Game/Traits => OpenRA.Mods.RA}/Cargo.cs              | 5 +++--
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                         | 4 ++++
 {OpenRA.Game/Traits => OpenRA.Mods.RA}/Passenger.cs          | 4 +++-
 7 files changed, 17 insertions(+), 9 deletions(-)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Activities/EnterTransport.cs (93%)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Activities/UnloadCargo.cs (93%)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Cargo.cs (93%)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Passenger.cs (93%)

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 203a5b3f6c..2b9b4645d9 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -153,7 +153,6 @@
     <Compile Include="Traits\World\CrateSpawner.cs" />
     <Compile Include="Traits\Activities\Attack.cs" />
     <Compile Include="Traits\Activities\CallFunc.cs" />
-    <Compile Include="Traits\Activities\EnterTransport.cs" />
     <Compile Include="Traits\Activities\Fly.cs" />
     <Compile Include="Traits\Activities\FlyAttack.cs" />
     <Compile Include="Traits\Activities\FlyTimed.cs" />
@@ -207,7 +206,6 @@
     <Compile Include="Traits\Activities\Follow.cs" />
     <Compile Include="Traits\Activities\Turn.cs" />
     <Compile Include="Traits\Activities\UndeployMcv.cs" />
-    <Compile Include="Traits\Activities\UnloadCargo.cs" />
     <Compile Include="Traits\Attack\AttackBase.cs" />
     <Compile Include="Traits\Attack\AttackFrontal.cs" />
     <Compile Include="Traits\Attack\AttackHeli.cs" />
@@ -222,7 +220,6 @@
     <Compile Include="Traits\Building.cs" />
     <Compile Include="Traits\World\BuildingInfluence.cs" />
     <Compile Include="Traits\CanPowerDown.cs" />
-    <Compile Include="Traits\Cargo.cs" />
     <Compile Include="Traits\Crate.cs" />
     <Compile Include="Traits\Explodes.cs" />
     <Compile Include="Traits\Fake.cs" />
@@ -234,7 +231,6 @@
     <Compile Include="Traits\LimitedAmmo.cs" />
     <Compile Include="Traits\World\PaletteFromFile.cs" />
     <Compile Include="Traits\World\PaletteFromRGBA.cs" />
-    <Compile Include="Traits\Passenger.cs" />
     <Compile Include="Traits\Player\PlaceBuilding.cs" />
     <Compile Include="Traits\World\PlayerColorPalette.cs" />
     <Compile Include="Traits\World\ResourceLayer.cs" />
diff --git a/OpenRA.Mods.Cnc/ProductionAirdrop.cs b/OpenRA.Mods.Cnc/ProductionAirdrop.cs
index ff5c0c665b..b25e21608d 100644
--- a/OpenRA.Mods.Cnc/ProductionAirdrop.cs
+++ b/OpenRA.Mods.Cnc/ProductionAirdrop.cs
@@ -21,6 +21,7 @@
 using OpenRA.GameRules;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
+using OpenRA.Mods.RA;
 
 namespace OpenRA.Mods.Cnc
 {
diff --git a/OpenRA.Game/Traits/Activities/EnterTransport.cs b/OpenRA.Mods.RA/Activities/EnterTransport.cs
similarity index 93%
rename from OpenRA.Game/Traits/Activities/EnterTransport.cs
rename to OpenRA.Mods.RA/Activities/EnterTransport.cs
index 38bf1fd3d4..b9bf4bf637 100644
--- a/OpenRA.Game/Traits/Activities/EnterTransport.cs
+++ b/OpenRA.Mods.RA/Activities/EnterTransport.cs
@@ -18,7 +18,9 @@
  */
 #endregion
 
-namespace OpenRA.Traits.Activities
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Activities
 {
 	class EnterTransport : IActivity
 	{
diff --git a/OpenRA.Game/Traits/Activities/UnloadCargo.cs b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
similarity index 93%
rename from OpenRA.Game/Traits/Activities/UnloadCargo.cs
rename to OpenRA.Mods.RA/Activities/UnloadCargo.cs
index c76113f1ba..5dbf455bca 100644
--- a/OpenRA.Game/Traits/Activities/UnloadCargo.cs
+++ b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
@@ -20,8 +20,10 @@
 
 using System.Linq;
 using OpenRA.GameRules;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	public class UnloadCargo : IActivity
 	{
diff --git a/OpenRA.Game/Traits/Cargo.cs b/OpenRA.Mods.RA/Cargo.cs
similarity index 93%
rename from OpenRA.Game/Traits/Cargo.cs
rename to OpenRA.Mods.RA/Cargo.cs
index 67200a0b87..174f6aaa5d 100644
--- a/OpenRA.Game/Traits/Cargo.cs
+++ b/OpenRA.Mods.RA/Cargo.cs
@@ -19,10 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRA.Traits.Activities;
 using OpenRA.GameRules;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	public class CargoInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index ba4a4a209f..e5e9cf54e7 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -49,13 +49,16 @@
     <Compile Include="Activities\CaptureBuilding.cs" />
     <Compile Include="Activities\DeliverOre.cs" />
     <Compile Include="Activities\Demolish.cs" />
+    <Compile Include="Activities\EnterTransport.cs" />
     <Compile Include="Activities\Infiltrate.cs" />
     <Compile Include="Activities\LayMine.cs" />
     <Compile Include="Activities\Steal.cs" />
     <Compile Include="Activities\Teleport.cs" />
+    <Compile Include="Activities\UnloadCargo.cs" />
     <Compile Include="AirstrikePower.cs" />
     <Compile Include="Burns.cs" />
     <Compile Include="C4Demolition.cs" />
+    <Compile Include="Cargo.cs" />
     <Compile Include="CarpetBomb.cs" />
     <Compile Include="Chronoshiftable.cs" />
     <Compile Include="CrateDrop.cs" />
@@ -83,6 +86,7 @@
     <Compile Include="IronCurtainPower.cs" />
     <Compile Include="ParaDrop.cs" />
     <Compile Include="ParatroopersPower.cs" />
+    <Compile Include="Passenger.cs" />
     <Compile Include="RequiresPower.cs" />
     <Compile Include="Mine.cs" />
     <Compile Include="Minelayer.cs" />
diff --git a/OpenRA.Game/Traits/Passenger.cs b/OpenRA.Mods.RA/Passenger.cs
similarity index 93%
rename from OpenRA.Game/Traits/Passenger.cs
rename to OpenRA.Mods.RA/Passenger.cs
index 66a55d4e87..a4df4ac57c 100644
--- a/OpenRA.Game/Traits/Passenger.cs
+++ b/OpenRA.Mods.RA/Passenger.cs
@@ -19,9 +19,11 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class PassengerInfo : TraitInfo<Passenger>
 	{