From 1d0848466f219ca2bdc93354f3ada8ac7ddb778f Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 20 May 2010 19:09:48 +1200
Subject: [PATCH] moved most render bits to ra

---
 OpenRA.Game/OpenRA.Game.csproj                | 19 ++++---------------
 OpenRA.Game/Traits/Activities/Sell.cs         |  4 +++-
 OpenRA.Game/Traits/Activities/UndeployMcv.cs  |  3 ---
 OpenRA.Game/Traits/ConstructionYard.cs        |  2 +-
 OpenRA.Game/Traits/DetectCloaked.cs           |  3 +++
 OpenRA.Game/Traits/Player/PlaceBuilding.cs    |  2 ++
 .../Traits/Render/RenderUnitTurreted.cs       |  3 ---
 OpenRA.Game/Traits/Util.cs                    |  2 +-
 .../Activities/Rearm.cs                       |  3 ++-
 .../Activities/Repair.cs                      |  3 ++-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj          | 11 +++++++++++
 .../RenderBuildingCharge.cs                   |  4 +++-
 .../RenderBuildingOre.cs                      |  4 +++-
 .../RenderBuildingWall.cs                     |  3 ++-
 .../RenderBuildingWarFactory.cs               |  3 ++-
 .../RenderUnitReload.cs                       |  7 +++++--
 .../RenderUnitRotor.cs                        |  3 ++-
 .../RenderUnitSpinner.cs                      |  3 ++-
 .../Traits => OpenRA.Mods.RA}/Repairable.cs   |  4 +++-
 OpenRA.Mods.RA/RepairableNear.cs              |  1 +
 .../Traits => OpenRA.Mods.RA}/RepairsUnits.cs |  4 +++-
 21 files changed, 55 insertions(+), 36 deletions(-)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Activities/Rearm.cs (93%)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Activities/Repair.cs (94%)
 rename {OpenRA.Game/Traits/Render => OpenRA.Mods.RA}/RenderBuildingCharge.cs (93%)
 mode change 100755 => 100644
 rename {OpenRA.Game/Traits/Render => OpenRA.Mods.RA}/RenderBuildingOre.cs (93%)
 rename {OpenRA.Game/Traits/Render => OpenRA.Mods.RA}/RenderBuildingWall.cs (95%)
 rename {OpenRA.Game/Traits/Render => OpenRA.Mods.RA}/RenderBuildingWarFactory.cs (95%)
 rename {OpenRA.Game/Traits/Render => OpenRA.Mods.RA}/RenderUnitReload.cs (87%)
 rename {OpenRA.Game/Traits/Render => OpenRA.Mods.RA}/RenderUnitRotor.cs (94%)
 rename {OpenRA.Game/Traits/Render => OpenRA.Mods.RA}/RenderUnitSpinner.cs (94%)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/Repairable.cs (93%)
 rename {OpenRA.Game/Traits => OpenRA.Mods.RA}/RepairsUnits.cs (92%)

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 671f611360..0a3fc8bdcc 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -81,12 +81,16 @@
     <Compile Include="GameRules\WeaponInfo.cs" />
     <Compile Include="Group.cs" />
     <Compile Include="Orders\GenericSelectTarget.cs" />
+    <Compile Include="Traits\Activities\UndeployMcv.cs" />
     <Compile Include="Traits\DetectCloaked.cs" />
     <Compile Include="Traits\Player\ActorGroupProxy.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\TechTreeCache.cs" />
     <Compile Include="Traits\Player\ConquestVictoryConditions.cs" />
     <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
+    <Compile Include="Traits\Render\RenderBuilding.cs" />
+    <Compile Include="Traits\Render\RenderBuildingTurreted.cs" />
+    <Compile Include="Traits\Render\RenderUnitTurreted.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
     <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
     <Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" />
@@ -157,9 +161,7 @@
     <Compile Include="Graphics\LineRenderer.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
     <Compile Include="Traits\Activities\Idle.cs" />
-    <Compile Include="Traits\Activities\Rearm.cs" />
     <Compile Include="Traits\Activities\RemoveSelf.cs" />
-    <Compile Include="Traits\Activities\Repair.cs" />
     <Compile Include="Traits\Activities\Sell.cs" />
     <Compile Include="Orders\IOrderGenerator.cs" />
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
@@ -185,7 +187,6 @@
     <Compile Include="Traits\Activities\Move.cs" />
     <Compile Include="Traits\Activities\Follow.cs" />
     <Compile Include="Traits\Activities\Turn.cs" />
-    <Compile Include="Traits\Activities\UndeployMcv.cs" />
     <Compile Include="Traits\Attack\AttackBase.cs" />
     <Compile Include="Traits\Attack\AttackInfo.cs" />
     <Compile Include="Traits\Modifiers\BelowUnits.cs" />
@@ -202,26 +203,16 @@
     <Compile Include="Traits\World\ResourceType.cs" />
     <Compile Include="Traits\SupportPower.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
-    <Compile Include="Traits\Repairable.cs" />
     <Compile Include="Traits\Reservable.cs" />
     <Compile Include="Traits\Selectable.cs" />
     <Compile Include="Traits\Player\ProductionQueue.cs" />
-    <Compile Include="Traits\Render\RenderBuildingCharge.cs" />
     <Compile Include="Traits\TransformsOnDeploy.cs" />
     <Compile Include="Traits\Mobile.cs" />
     <Compile Include="Traits\Production.cs" />
     <Compile Include="Traits\RallyPoint.cs" />
-    <Compile Include="Traits\Render\RenderBuilding.cs" />
-    <Compile Include="Traits\Render\RenderBuildingOre.cs" />
-    <Compile Include="Traits\Render\RenderBuildingTurreted.cs" />
-    <Compile Include="Traits\Render\RenderBuildingWarFactory.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\Render\RenderUnit.cs" />
     <Compile Include="Traits\Modifiers\WithMuzzleFlash.cs" />
-    <Compile Include="Traits\Render\RenderUnitReload.cs" />
-    <Compile Include="Traits\Render\RenderUnitRotor.cs" />
-    <Compile Include="Traits\Render\RenderUnitSpinner.cs" />
-    <Compile Include="Traits\Render\RenderUnitTurreted.cs" />
     <Compile Include="Traits\StoresOre.cs" />
     <Compile Include="Traits\Cloak.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
@@ -239,7 +230,6 @@
     <Compile Include="World.cs" />
     <Compile Include="WorldUtils.cs" />
     <Compile Include="Traits\Wall.cs" />
-    <Compile Include="Traits\Render\RenderBuildingWall.cs" />
     <Compile Include="Traits\Player\EvaAlerts.cs" />
     <Compile Include="Traits\World\ScreenShaker.cs" />
     <Compile Include="Traits\LineBuild.cs" />
@@ -252,7 +242,6 @@
     <Compile Include="Widgets\CheckboxWidget.cs" />
     <Compile Include="Traits\Activities\Wait.cs" />
     <Compile Include="Traits\World\GlobalDefaults.cs" />
-    <Compile Include="Traits\RepairsUnits.cs" />
     <Compile Include="Traits\World\BibLayer.cs" />
     <Compile Include="Traits\World\SmudgeLayer.cs" />
     <Compile Include="Widgets\Delegates\IngameChromeDelegate.cs" />
diff --git a/OpenRA.Game/Traits/Activities/Sell.cs b/OpenRA.Game/Traits/Activities/Sell.cs
index 9c34572b4b..77e37d5541 100644
--- a/OpenRA.Game/Traits/Activities/Sell.cs
+++ b/OpenRA.Game/Traits/Activities/Sell.cs
@@ -48,7 +48,9 @@ namespace OpenRA.Traits.Activities
 		{
 			if( !started )
 			{
-				framesRemaining = (self.Info.Traits.Get<RenderBuildingInfo>().HasMakeAnimation) ? self.traits.Get<RenderSimple>().anim.GetSequence( "make" ).Length : 0;
+				framesRemaining = self.traits.Get<RenderSimple>().anim.HasSequence("make") 
+					? self.traits.Get<RenderSimple>().anim.GetSequence( "make" ).Length : 0;
+
 				foreach( var ns in self.traits.WithInterface<INotifySold>() )
 					ns.Selling( self );
 
diff --git a/OpenRA.Game/Traits/Activities/UndeployMcv.cs b/OpenRA.Game/Traits/Activities/UndeployMcv.cs
index ca8ec9e70f..3a5a86210e 100644
--- a/OpenRA.Game/Traits/Activities/UndeployMcv.cs
+++ b/OpenRA.Game/Traits/Activities/UndeployMcv.cs
@@ -18,9 +18,6 @@
  */
 #endregion
 
-using System;
-using OpenRA.Traits;
-
 namespace OpenRA.Traits.Activities
 {
 	class UndeployMcv : IActivity
diff --git a/OpenRA.Game/Traits/ConstructionYard.cs b/OpenRA.Game/Traits/ConstructionYard.cs
index b45d808e19..72bff2d784 100644
--- a/OpenRA.Game/Traits/ConstructionYard.cs
+++ b/OpenRA.Game/Traits/ConstructionYard.cs
@@ -18,8 +18,8 @@
  */
 #endregion
 
-using OpenRA.Traits.Activities;
 using OpenRA.GameRules;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
diff --git a/OpenRA.Game/Traits/DetectCloaked.cs b/OpenRA.Game/Traits/DetectCloaked.cs
index cd342a093e..fd20eecfbd 100644
--- a/OpenRA.Game/Traits/DetectCloaked.cs
+++ b/OpenRA.Game/Traits/DetectCloaked.cs
@@ -52,4 +52,7 @@ namespace OpenRA.Traits
 			}
 		}
 	}
+
+	class RenderRangeCircleInfo : TraitInfo<RenderRangeCircle> { }
+	class RenderRangeCircle { }
 }
diff --git a/OpenRA.Game/Traits/Player/PlaceBuilding.cs b/OpenRA.Game/Traits/Player/PlaceBuilding.cs
index 613db8bed2..9e5f76c90e 100644
--- a/OpenRA.Game/Traits/Player/PlaceBuilding.cs
+++ b/OpenRA.Game/Traits/Player/PlaceBuilding.cs
@@ -62,6 +62,8 @@ namespace OpenRA.Traits
 							Sound.PlayToPlayer(order.Player, s, building.CenterLocation);
 					}
 
+					/* todo: reimpl this properly */
+
 					var facts = w.Queries.OwnedBy[self.Owner]
 						.WithTrait<ConstructionYard>().Select(x => x.Actor);
 
diff --git a/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs b/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs
index 22f7d06075..af7ec971af 100644
--- a/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs
+++ b/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs
@@ -64,7 +64,4 @@ namespace OpenRA.Traits
 			}
 		}
 	}
-
-	class RenderRangeCircleInfo : TraitInfo<RenderRangeCircle> { }
-	class RenderRangeCircle { }
 }
diff --git a/OpenRA.Game/Traits/Util.cs b/OpenRA.Game/Traits/Util.cs
index 9e04a1c4e5..0fa517724c 100755
--- a/OpenRA.Game/Traits/Util.cs
+++ b/OpenRA.Game/Traits/Util.cs
@@ -21,8 +21,8 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Graphics;
 using OpenRA.GameRules;
+using OpenRA.Graphics;
 
 namespace OpenRA.Traits
 {
diff --git a/OpenRA.Game/Traits/Activities/Rearm.cs b/OpenRA.Mods.RA/Activities/Rearm.cs
similarity index 93%
rename from OpenRA.Game/Traits/Activities/Rearm.cs
rename to OpenRA.Mods.RA/Activities/Rearm.cs
index 36494215ba..e1cd2d54a9 100644
--- a/OpenRA.Game/Traits/Activities/Rearm.cs
+++ b/OpenRA.Mods.RA/Activities/Rearm.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	public class Rearm : IActivity
 	{
diff --git a/OpenRA.Game/Traits/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs
similarity index 94%
rename from OpenRA.Game/Traits/Activities/Repair.cs
rename to OpenRA.Mods.RA/Activities/Repair.cs
index a479ff5fc1..7e1b1f7a58 100644
--- a/OpenRA.Game/Traits/Activities/Repair.cs
+++ b/OpenRA.Mods.RA/Activities/Repair.cs
@@ -20,8 +20,9 @@
 
 using System;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	public class Repair : IActivity
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 64533c77b7..feb132a71c 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -61,6 +61,8 @@
     <Compile Include="Activities\Land.cs" />
     <Compile Include="Activities\LayMine.cs" />
     <Compile Include="Activities\Leap.cs" />
+    <Compile Include="Activities\Rearm.cs" />
+    <Compile Include="Activities\Repair.cs" />
     <Compile Include="Activities\ReturnToBase.cs" />
     <Compile Include="Activities\Steal.cs" />
     <Compile Include="Activities\Teleport.cs" />
@@ -123,8 +125,17 @@
     <Compile Include="Passenger.cs" />
     <Compile Include="Plane.cs" />
     <Compile Include="ProductionSurround.cs" />
+    <Compile Include="RenderBuildingCharge.cs" />
+    <Compile Include="RenderBuildingOre.cs" />
+    <Compile Include="RenderBuildingWall.cs" />
+    <Compile Include="RenderBuildingWarFactory.cs" />
     <Compile Include="RenderFlare.cs" />
     <Compile Include="RenderInfantry.cs" />
+    <Compile Include="RenderUnitReload.cs" />
+    <Compile Include="RenderUnitRotor.cs" />
+    <Compile Include="RenderUnitSpinner.cs" />
+    <Compile Include="Repairable.cs" />
+    <Compile Include="RepairsUnits.cs" />
     <Compile Include="RequiresPower.cs" />
     <Compile Include="Mine.cs" />
     <Compile Include="Minelayer.cs" />
diff --git a/OpenRA.Game/Traits/Render/RenderBuildingCharge.cs b/OpenRA.Mods.RA/RenderBuildingCharge.cs
old mode 100755
new mode 100644
similarity index 93%
rename from OpenRA.Game/Traits/Render/RenderBuildingCharge.cs
rename to OpenRA.Mods.RA/RenderBuildingCharge.cs
index 70486d1d6b..2d7fb585e6
--- a/OpenRA.Game/Traits/Render/RenderBuildingCharge.cs
+++ b/OpenRA.Mods.RA/RenderBuildingCharge.cs
@@ -18,7 +18,9 @@
  */
 #endregion
 
-namespace OpenRA.Traits
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
 {
 	class RenderBuildingChargeInfo : RenderBuildingInfo
 	{
diff --git a/OpenRA.Game/Traits/Render/RenderBuildingOre.cs b/OpenRA.Mods.RA/RenderBuildingOre.cs
similarity index 93%
rename from OpenRA.Game/Traits/Render/RenderBuildingOre.cs
rename to OpenRA.Mods.RA/RenderBuildingOre.cs
index 35d5aed0da..002c42163c 100644
--- a/OpenRA.Game/Traits/Render/RenderBuildingOre.cs
+++ b/OpenRA.Mods.RA/RenderBuildingOre.cs
@@ -18,7 +18,9 @@
  */
 #endregion
 
-namespace OpenRA.Traits
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
 {
 	class RenderBuildingOreInfo : RenderBuildingInfo
 	{
diff --git a/OpenRA.Game/Traits/Render/RenderBuildingWall.cs b/OpenRA.Mods.RA/RenderBuildingWall.cs
similarity index 95%
rename from OpenRA.Game/Traits/Render/RenderBuildingWall.cs
rename to OpenRA.Mods.RA/RenderBuildingWall.cs
index 24129e2af5..04db0e5fd4 100644
--- a/OpenRA.Game/Traits/Render/RenderBuildingWall.cs
+++ b/OpenRA.Mods.RA/RenderBuildingWall.cs
@@ -20,8 +20,9 @@
 
 using System.Linq;
 using System;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class RenderBuildingWallInfo : RenderBuildingInfo
 	{
diff --git a/OpenRA.Game/Traits/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/RenderBuildingWarFactory.cs
similarity index 95%
rename from OpenRA.Game/Traits/Render/RenderBuildingWarFactory.cs
rename to OpenRA.Mods.RA/RenderBuildingWarFactory.cs
index d5deeae26d..672c840e97 100644
--- a/OpenRA.Game/Traits/Render/RenderBuildingWarFactory.cs
+++ b/OpenRA.Mods.RA/RenderBuildingWarFactory.cs
@@ -20,8 +20,9 @@
 
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class RenderWarFactoryInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
 	{
diff --git a/OpenRA.Game/Traits/Render/RenderUnitReload.cs b/OpenRA.Mods.RA/RenderUnitReload.cs
similarity index 87%
rename from OpenRA.Game/Traits/Render/RenderUnitReload.cs
rename to OpenRA.Mods.RA/RenderUnitReload.cs
index 87c302a77d..3190183e43 100644
--- a/OpenRA.Game/Traits/Render/RenderUnitReload.cs
+++ b/OpenRA.Mods.RA/RenderUnitReload.cs
@@ -18,7 +18,10 @@
  */
 #endregion
 
-namespace OpenRA.Traits
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
+
+namespace OpenRA.Mods.RA
 {
 	class RenderUnitReloadInfo : RenderUnitInfo
 	{
@@ -32,7 +35,7 @@ namespace OpenRA.Traits
 
 		public override void Tick(Actor self)
 		{
-			var isAttacking = self.GetCurrentActivity() is Activities.Attack;
+			var isAttacking = self.GetCurrentActivity() is Attack;
 
 			var attack = self.traits.GetOrDefault<AttackBase>();
 
diff --git a/OpenRA.Game/Traits/Render/RenderUnitRotor.cs b/OpenRA.Mods.RA/RenderUnitRotor.cs
similarity index 94%
rename from OpenRA.Game/Traits/Render/RenderUnitRotor.cs
rename to OpenRA.Mods.RA/RenderUnitRotor.cs
index 4b87691964..e244353157 100644
--- a/OpenRA.Game/Traits/Render/RenderUnitRotor.cs
+++ b/OpenRA.Mods.RA/RenderUnitRotor.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class RenderUnitRotorInfo : RenderUnitInfo
 	{
diff --git a/OpenRA.Game/Traits/Render/RenderUnitSpinner.cs b/OpenRA.Mods.RA/RenderUnitSpinner.cs
similarity index 94%
rename from OpenRA.Game/Traits/Render/RenderUnitSpinner.cs
rename to OpenRA.Mods.RA/RenderUnitSpinner.cs
index 9f181354de..575fe94025 100644
--- a/OpenRA.Game/Traits/Render/RenderUnitSpinner.cs
+++ b/OpenRA.Mods.RA/RenderUnitSpinner.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class RenderUnitSpinnerInfo : RenderUnitInfo
 	{
diff --git a/OpenRA.Game/Traits/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs
similarity index 93%
rename from OpenRA.Game/Traits/Repairable.cs
rename to OpenRA.Mods.RA/Repairable.cs
index 0ca69d6e28..1b7a08fe6c 100644
--- a/OpenRA.Game/Traits/Repairable.cs
+++ b/OpenRA.Mods.RA/Repairable.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 RepairableInfo : TraitInfo<Repairable> { public readonly string[] RepairBuildings = { "fix" }; }
 
diff --git a/OpenRA.Mods.RA/RepairableNear.cs b/OpenRA.Mods.RA/RepairableNear.cs
index a6748876ab..6236fa8f5d 100644
--- a/OpenRA.Mods.RA/RepairableNear.cs
+++ b/OpenRA.Mods.RA/RepairableNear.cs
@@ -19,6 +19,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
diff --git a/OpenRA.Game/Traits/RepairsUnits.cs b/OpenRA.Mods.RA/RepairsUnits.cs
similarity index 92%
rename from OpenRA.Game/Traits/RepairsUnits.cs
rename to OpenRA.Mods.RA/RepairsUnits.cs
index 39c129f176..946f2d4b3e 100644
--- a/OpenRA.Game/Traits/RepairsUnits.cs
+++ b/OpenRA.Mods.RA/RepairsUnits.cs
@@ -18,7 +18,9 @@
  */
 #endregion
 
-namespace OpenRA.Traits
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
 {
 	public class RepairsUnitsInfo : TraitInfo<RepairsUnits>
 	{