From c431545a44ff31c2594d9758cce7950f77bc93c3 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 5 Jan 2015 23:08:29 +0100
Subject: [PATCH] Wrap up Render traits move

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj           |  2 ++
 .../Traits}/Render/WithActiveAnimation.cs              |  3 +--
 .../Traits}/Render/WithIdleOverlay.cs                  |  3 +--
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                   | 10 ++++------
 OpenRA.Mods.RA/{ => Traits}/Render/RenderDisguise.cs   |  0
 OpenRA.Mods.RA/{ => Traits}/Render/RenderHarvester.cs  |  0
 .../{ => Traits}/Render/RenderLandingCraft.cs          |  0
 OpenRA.Mods.RA/{ => Traits}/Render/RenderUnitReload.cs |  0
 8 files changed, 8 insertions(+), 10 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/WithActiveAnimation.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/WithIdleOverlay.cs (98%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderDisguise.cs (100%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderHarvester.cs (100%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderLandingCraft.cs (100%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderUnitReload.cs (100%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 613dbdd609..84c20944bb 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -294,11 +294,13 @@
     <Compile Include="Traits\Render\RenderBuildingWall.cs" />
     <Compile Include="Traits\Render\RenderDetectionCircle.cs" />
     <Compile Include="Traits\Render\RenderRangeCircle.cs" />
+    <Compile Include="Traits\Render\WithActiveAnimation.cs" />
     <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="Traits\Render\WithMakeAnimation.cs" />
     <Compile Include="Traits\Render\WithCrateBody.cs" />
     <Compile Include="Traits\Render\WithDeathAnimation.cs" />
     <Compile Include="Traits\Render\WithHarvestAnimation.cs" />
+    <Compile Include="Traits\Render\WithIdleOverlay.cs" />
     <Compile Include="Traits\Render\WithMuzzleFlash.cs" />
     <Compile Include="Traits\Render\WithRangeCircle.cs" />
     <Compile Include="Traits\Render\WithRepairAnimation.cs" />
diff --git a/OpenRA.Mods.RA/Render/WithActiveAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
similarity index 96%
rename from OpenRA.Mods.RA/Render/WithActiveAnimation.cs
rename to OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
index 965c657548..a372ee24d9 100644
--- a/OpenRA.Mods.RA/Render/WithActiveAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
@@ -11,10 +11,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Replaces the idle animation of a building.")]
 	public class WithActiveAnimationInfo : ITraitInfo, Requires<RenderBuildingInfo>
diff --git a/OpenRA.Mods.RA/Render/WithIdleOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
similarity index 98%
rename from OpenRA.Mods.RA/Render/WithIdleOverlay.cs
rename to OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
index b50d585e3e..0b67e178b1 100644
--- a/OpenRA.Mods.RA/Render/WithIdleOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Renders a decorative animation on units and buildings.")]
 	public class WithIdleOverlayInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 7f71a7d537..6214752d43 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -81,7 +81,6 @@
     <Compile Include="AI\AttackOrFleeFuzzy.cs" />
     <Compile Include="AI\BaseBuilder.cs" />
     <Compile Include="AI\HackyAI.cs" />
-    <Compile Include="Render\WithIdleOverlay.cs" />
     <Compile Include="Traits\AcceptsSupplies.cs" />
     <Compile Include="Activities\DeliverResources.cs" />
     <Compile Include="Activities\Demolish.cs" />
@@ -96,7 +95,7 @@
     <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
-    <Compile Include="Render\RenderUnitReload.cs" />
+    <Compile Include="Traits\Render\RenderUnitReload.cs" />
     <Compile Include="Graphics\TeslaZapRenderable.cs" />
     <Compile Include="EjectOnDeath.cs" />
     <Compile Include="AI\RushFuzzy.cs" />
@@ -137,9 +136,9 @@
     <Compile Include="Scripting\Properties\GuardProperties.cs" />
     <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
     <Compile Include="Traits\Render\RenderJammerCircle.cs" />
-    <Compile Include="Render\RenderHarvester.cs" />
-    <Compile Include="Render\RenderDisguise.cs" />
-    <Compile Include="Render\RenderLandingCraft.cs" />
+    <Compile Include="Traits\Render\RenderHarvester.cs" />
+    <Compile Include="Traits\Render\RenderDisguise.cs" />
+    <Compile Include="Traits\Render\RenderLandingCraft.cs" />
     <Compile Include="Disguise.cs" />
     <Compile Include="Traits\SupplyTruck.cs" />
     <Compile Include="SupportPowers\AirstrikePower.cs" />
@@ -230,7 +229,6 @@
     <Compile Include="Parachutable.cs" />
     <Compile Include="Widgets\Logic\InstallFromCDLogic.cs" />
     <Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
-    <Compile Include="Render\WithActiveAnimation.cs" />
     <Compile Include="SupportPowers\SpawnActorPower.cs" />
     <Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
     <Compile Include="Cloneable.cs" />
diff --git a/OpenRA.Mods.RA/Render/RenderDisguise.cs b/OpenRA.Mods.RA/Traits/Render/RenderDisguise.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderDisguise.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderDisguise.cs
diff --git a/OpenRA.Mods.RA/Render/RenderHarvester.cs b/OpenRA.Mods.RA/Traits/Render/RenderHarvester.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderHarvester.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderHarvester.cs
diff --git a/OpenRA.Mods.RA/Render/RenderLandingCraft.cs b/OpenRA.Mods.RA/Traits/Render/RenderLandingCraft.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderLandingCraft.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderLandingCraft.cs
diff --git a/OpenRA.Mods.RA/Render/RenderUnitReload.cs b/OpenRA.Mods.RA/Traits/Render/RenderUnitReload.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderUnitReload.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderUnitReload.cs