From 9a1e1104818dbea8a809a5981cfb3c907f384950 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Tue, 9 Dec 2014 22:37:49 +0100
Subject: [PATCH] Move some Render traits to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                  | 4 ++++
 .../Traits}/Render/RenderNameTag.cs                           | 2 +-
 .../Traits}/Render/WithShadow.cs                              | 4 +---
 .../Traits}/Render/WithSmoke.cs                               | 3 +--
 .../Traits}/SmokeTrailWhenDamaged.cs                          | 2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                          | 4 ----
 6 files changed, 8 insertions(+), 11 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/RenderNameTag.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/WithShadow.cs (92%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/WithSmoke.cs (95%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/SmokeTrailWhenDamaged.cs (97%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 836ffcc6e9..b2b8db7722 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -139,13 +139,17 @@
     <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\Render\RenderEditorOnly.cs" />
     <Compile Include="Traits\Render\RenderFlare.cs" />
+    <Compile Include="Traits\Render\RenderNameTag.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\Render\RenderSprites.cs" />
     <Compile Include="Traits\Render\RenderUnit.cs" />
     <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="Traits\Render\WithDeathAnimation.cs" />
     <Compile Include="Traits\Render\WithResources.cs" />
+    <Compile Include="Traits\Render\WithShadow.cs" />
+    <Compile Include="Traits\Render\WithSmoke.cs" />
     <Compile Include="Traits\ShakeOnDeath.cs" />
+    <Compile Include="Traits\SmokeTrailWhenDamaged.cs" />
     <Compile Include="Traits\Sound\ActorLostNotification.cs" />
     <Compile Include="Traits\Sound\AnnounceOnBuild.cs" />
     <Compile Include="Traits\Sound\AnnounceOnKill.cs" />
diff --git a/OpenRA.Mods.RA/Render/RenderNameTag.cs b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs
similarity index 97%
rename from OpenRA.Mods.RA/Render/RenderNameTag.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs
index 5fbb6883e0..3c6f68972a 100644
--- a/OpenRA.Mods.RA/Render/RenderNameTag.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs
@@ -14,7 +14,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Displays the player name above the unit")]
 	class RenderNameTagInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Render/WithShadow.cs b/OpenRA.Mods.Common/Traits/Render/WithShadow.cs
similarity index 92%
rename from OpenRA.Mods.RA/Render/WithShadow.cs
rename to OpenRA.Mods.Common/Traits/Render/WithShadow.cs
index a48e655c6d..6081f03981 100644
--- a/OpenRA.Mods.RA/Render/WithShadow.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithShadow.cs
@@ -12,11 +12,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Clones the aircraft sprite with another palette below it.")]
 	class WithShadowInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Render/WithSmoke.cs b/OpenRA.Mods.Common/Traits/Render/WithSmoke.cs
similarity index 95%
rename from OpenRA.Mods.RA/Render/WithSmoke.cs
rename to OpenRA.Mods.Common/Traits/Render/WithSmoke.cs
index 2ffea3c2d6..56cc848d22 100644
--- a/OpenRA.Mods.RA/Render/WithSmoke.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithSmoke.cs
@@ -9,10 +9,9 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Renders an overlay when the actor is taking heavy damage.")]
 	public class WithSmokeInfo : ITraitInfo, Requires<RenderSpritesInfo>
diff --git a/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs b/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
similarity index 97%
rename from OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
rename to OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
index 98a0946092..5ce1f6e9a6 100644
--- a/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
+++ b/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	class SmokeTrailWhenDamagedInfo : ITraitInfo, Requires<IBodyOrientationInfo>
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index c67ec758cc..94f8d9665c 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -247,17 +247,13 @@
     <Compile Include="Render\RenderLandingCraft.cs" />
     <Compile Include="Render\WithBuildingExplosion.cs" />
     <Compile Include="Render\WithMuzzleFlash.cs" />
-    <Compile Include="Render\RenderNameTag.cs" />
     <Compile Include="Render\WithRotor.cs" />
-    <Compile Include="Render\WithShadow.cs" />
-    <Compile Include="Render\WithSmoke.cs" />
     <Compile Include="Repairable.cs" />
     <Compile Include="RepairableNear.cs" />
     <Compile Include="ScaredyCat.cs" />
     <Compile Include="SeedsResource.cs" />
     <Compile Include="SelfHealing.cs" />
     <Compile Include="Sellable.cs" />
-    <Compile Include="SmokeTrailWhenDamaged.cs" />
     <Compile Include="SpawnMPUnits.cs" />
     <Compile Include="Disguise.cs" />
     <Compile Include="StoresResources.cs" />