From 0807b7009b4c16c5db3cd76614c4296dc03ebed5 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Fri, 7 Nov 2014 15:13:58 +0100
Subject: [PATCH 1/2] Move NullLoadScreen, DefaultLoadScreen and
 LoadWidgetAtGameStart to Mods.Common

---
 {OpenRA.Mods.RA => OpenRA.Mods.Common}/DefaultLoadScreen.cs    | 2 +-
 .../LoadWidgetAtGameStart.cs                                   | 2 +-
 {OpenRA.Mods.RA => OpenRA.Mods.Common}/NullLoadScreen.cs       | 2 +-
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                   | 3 +++
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                           | 3 ---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/DefaultLoadScreen.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/LoadWidgetAtGameStart.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/NullLoadScreen.cs (96%)

diff --git a/OpenRA.Mods.RA/DefaultLoadScreen.cs b/OpenRA.Mods.Common/DefaultLoadScreen.cs
similarity index 98%
rename from OpenRA.Mods.RA/DefaultLoadScreen.cs
rename to OpenRA.Mods.Common/DefaultLoadScreen.cs
index feb5d219a4..d744d1a6e4 100644
--- a/OpenRA.Mods.RA/DefaultLoadScreen.cs
+++ b/OpenRA.Mods.Common/DefaultLoadScreen.cs
@@ -16,7 +16,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class DefaultLoadScreen : ILoadScreen
 	{
diff --git a/OpenRA.Mods.RA/LoadWidgetAtGameStart.cs b/OpenRA.Mods.Common/LoadWidgetAtGameStart.cs
similarity index 97%
rename from OpenRA.Mods.RA/LoadWidgetAtGameStart.cs
rename to OpenRA.Mods.Common/LoadWidgetAtGameStart.cs
index 8d229f9b6a..6eeba74222 100644
--- a/OpenRA.Mods.RA/LoadWidgetAtGameStart.cs
+++ b/OpenRA.Mods.Common/LoadWidgetAtGameStart.cs
@@ -12,7 +12,7 @@ using OpenRA.Graphics;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class LoadWidgetAtGameStartInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/NullLoadScreen.cs b/OpenRA.Mods.Common/NullLoadScreen.cs
similarity index 96%
rename from OpenRA.Mods.RA/NullLoadScreen.cs
rename to OpenRA.Mods.Common/NullLoadScreen.cs
index 705aa15a94..6b91a81445 100644
--- a/OpenRA.Mods.RA/NullLoadScreen.cs
+++ b/OpenRA.Mods.Common/NullLoadScreen.cs
@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class NullLoadScreen : ILoadScreen
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index e2943e07b9..ad8c935b76 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -49,6 +49,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CommonTraitsInterfaces.cs" />
+    <Compile Include="DefaultLoadScreen.cs" />
     <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Effects\Bullet.cs" />
     <Compile Include="Effects\Contrail.cs" />
@@ -75,10 +76,12 @@
     <Compile Include="Graphics\TextRenderable.cs" />
     <Compile Include="Graphics\VoxelActorPreview.cs" />
     <Compile Include="Graphics\VoxelRenderable.cs" />
+    <Compile Include="LoadWidgetAtGameStart.cs" />
     <Compile Include="ModChooserLoadScreen.cs" />
     <Compile Include="Modifiers\DisabledOverlay.cs" />
     <Compile Include="Modifiers\HiddenUnderFog.cs" />
     <Compile Include="Modifiers\UpgradeOverlay.cs" />
+    <Compile Include="NullLoadScreen.cs" />
     <Compile Include="Orders\DeployOrderTargeter.cs" />
     <Compile Include="Orders\EnterAlliedActorTargeter.cs" />
     <Compile Include="Orders\UnitOrderTargeter.cs" />
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 5537d0be87..ed19a8839b 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -236,8 +236,6 @@
     <Compile Include="Move\PathFinder.cs" />
     <Compile Include="Move\PathSearch.cs" />
     <Compile Include="NukePaletteEffect.cs" />
-    <Compile Include="NullLoadScreen.cs" />
-    <Compile Include="LoadWidgetAtGameStart.cs" />
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Orders\PowerDownOrderGenerator.cs" />
     <Compile Include="Orders\RepairOrderGenerator.cs" />
@@ -268,7 +266,6 @@
     <Compile Include="ProductionBar.cs" />
     <Compile Include="ProximityCaptor.cs" />
     <Compile Include="ProximityCapturable.cs" />
-    <Compile Include="DefaultLoadScreen.cs" />
     <Compile Include="RadarColorFromTerrain.cs" />
     <Compile Include="Reloads.cs" />
     <Compile Include="RenderDetectionCircle.cs" />

From 52bb0e8c6bcd6ce44a9b8b16ed75c38e46a86eda Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Fri, 7 Nov 2014 15:15:47 +0100
Subject: [PATCH 2/2] Move some Warheads to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj               | 3 +++
 .../Warheads/CreateEffectWarhead.cs                        | 2 +-
 .../Warheads/HealthPercentageDamageWarhead.cs              | 2 +-
 .../Warheads/SpreadDamageWarhead.cs                        | 2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                       | 7 ++-----
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Warheads/CreateEffectWarhead.cs (99%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Warheads/HealthPercentageDamageWarhead.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Warheads/SpreadDamageWarhead.cs (98%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index ad8c935b76..094d0a049d 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -121,7 +121,10 @@
     <Compile Include="UtilityCommands\UpgradeMapCommand.cs" />
     <Compile Include="UtilityCommands\UpgradeModCommand.cs" />
     <Compile Include="UtilityCommands\UpgradeRules.cs" />
+    <Compile Include="Warheads\CreateEffectWarhead.cs" />
+    <Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
     <Compile Include="Warheads\LeaveSmudgeWarhead.cs" />
+    <Compile Include="Warheads\SpreadDamageWarhead.cs" />
     <Compile Include="Widgets\ConfirmationDialogs.cs" />
     <Compile Include="Widgets\HueSliderWidget.cs" />
     <Compile Include="Widgets\LabelWithTooltipWidget.cs" />
diff --git a/OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
similarity index 99%
rename from OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs
rename to OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
index 54e8dba1ca..55d47125a4 100644
--- a/OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs
+++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
@@ -15,7 +15,7 @@ using OpenRA.GameRules;
 using OpenRA.Traits;
 using OpenRA.Mods.Common.Effects;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class CreateEffectWarhead : Warhead
 	{
diff --git a/OpenRA.Mods.RA/Warheads/HealthPercentageDamageWarhead.cs b/OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
similarity index 98%
rename from OpenRA.Mods.RA/Warheads/HealthPercentageDamageWarhead.cs
rename to OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
index 6bc23a56db..61d9338803 100644
--- a/OpenRA.Mods.RA/Warheads/HealthPercentageDamageWarhead.cs
+++ b/OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
@@ -15,7 +15,7 @@ using OpenRA.Effects;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class HealthPercentageDamageWarhead : DamageWarhead
 	{
diff --git a/OpenRA.Mods.RA/Warheads/SpreadDamageWarhead.cs b/OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
similarity index 98%
rename from OpenRA.Mods.RA/Warheads/SpreadDamageWarhead.cs
rename to OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
index 90c7d070ae..f505dd9834 100644
--- a/OpenRA.Mods.RA/Warheads/SpreadDamageWarhead.cs
+++ b/OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
@@ -15,7 +15,7 @@ using OpenRA.Effects;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class SpreadDamageWarhead : DamageWarhead
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index ed19a8839b..f645279052 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -256,9 +256,6 @@
     <Compile Include="PortableChrono.cs" />
     <Compile Include="Scripting\Properties\GuardProperties.cs" />
     <Compile Include="Scripting\Properties\PlayerProperties.cs" />
-    <Compile Include="Warheads\DestroyResourceWarhead.cs" />
-    <Compile Include="Warheads\CreateEffectWarhead.cs" />
-    <Compile Include="Warheads\CreateResourceWarhead.cs" />
     <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
     <Compile Include="Player\TechTree.cs" />
     <Compile Include="PrimaryBuilding.cs" />
@@ -474,9 +471,9 @@
     <Compile Include="Player\GlobalUpgradeManager.cs" />
     <Compile Include="GainsStatUpgrades.cs" />
     <Compile Include="Player\Extensions.cs" />
-    <Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
+    <Compile Include="Warheads\CreateResourceWarhead.cs" />
+    <Compile Include="Warheads\DestroyResourceWarhead.cs" />
     <Compile Include="Warheads\PerCellDamageWarhead.cs" />
-    <Compile Include="Warheads\SpreadDamageWarhead.cs" />
     <Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
     <Compile Include="Scripting\Global\DateTimeGlobal.cs" />
     <Compile Include="Scripting\Properties\HarvesterProperties.cs" />