Merge pull request #6906 from reaperrr/common-10

Moved LoadScreens and some Warheads to Mods.Common

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
 	{

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
 	{

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
 	{

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" />
@@ -118,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" />

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
 	{

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
 	{

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
 	{

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" />
@@ -258,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" />
@@ -268,7 +263,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" />
@@ -477,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" />