From 5e866b862bd039a1bec43185b6afc274d3e73c93 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 9 Nov 2014 16:42:31 +0100
Subject: [PATCH] Move Burns from RA to Common, move RallyPoint to Traits
 folder

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj           | 3 ++-
 {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Burns.cs | 2 +-
 OpenRA.Mods.Common/{ => Traits}/RallyPoint.cs          | 0
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                   | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Burns.cs (97%)
 rename OpenRA.Mods.Common/{ => Traits}/RallyPoint.cs (100%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index fb2815147f..1e5952956e 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -91,7 +91,6 @@
     <Compile Include="PaletteEffects\MenuPaletteEffect.cs" />
     <Compile Include="PaletteEffects\NukePaletteEffect.cs" />
     <Compile Include="PaletteEffects\WaterPaletteRotation.cs" />
-    <Compile Include="RallyPoint.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
     <Compile Include="ServerTraits\LobbyCommands.cs" />
     <Compile Include="ServerTraits\LobbySettingsNotification.cs" />
@@ -99,9 +98,11 @@
     <Compile Include="ServerTraits\PlayerPinger.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Immobile.cs" />
+    <Compile Include="Traits\Burns.cs" />
     <Compile Include="Traits\Demolishable.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
+    <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\ShakeOnDeath.cs" />
     <Compile Include="Traits\Power\AffectedByPowerOutage.cs" />
     <Compile Include="Traits\Power\CanPowerDown.cs" />
diff --git a/OpenRA.Mods.RA/Burns.cs b/OpenRA.Mods.Common/Traits/Burns.cs
similarity index 97%
rename from OpenRA.Mods.RA/Burns.cs
rename to OpenRA.Mods.Common/Traits/Burns.cs
index 2726855688..fcf66b2446 100644
--- a/OpenRA.Mods.RA/Burns.cs
+++ b/OpenRA.Mods.Common/Traits/Burns.cs
@@ -12,7 +12,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("This actor will play a fire animation over its body and take damage over time.")]
 	class BurnsInfo : ITraitInfo, Requires<RenderSpritesInfo>
diff --git a/OpenRA.Mods.Common/RallyPoint.cs b/OpenRA.Mods.Common/Traits/RallyPoint.cs
similarity index 100%
rename from OpenRA.Mods.Common/RallyPoint.cs
rename to OpenRA.Mods.Common/Traits/RallyPoint.cs
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 12cdb6dc8a..0175a5d0fb 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -171,7 +171,6 @@
     <Compile Include="Buildings\LineBuild.cs" />
     <Compile Include="Buildings\RepairableBuilding.cs" />
     <Compile Include="Buildings\Util.cs" />
-    <Compile Include="Burns.cs" />
     <Compile Include="C4Demolition.cs" />
     <Compile Include="ExternalCapturable.cs" />
     <Compile Include="ExternalCapturableBar.cs" />