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 dac0a791ce..e911ecaac2 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -49,6 +49,7 @@ + @@ -75,10 +76,12 @@ + + @@ -118,7 +121,10 @@ + + + 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 5537d0be87..f645279052 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -236,8 +236,6 @@ - - @@ -258,9 +256,6 @@ - - - @@ -268,7 +263,6 @@ - @@ -477,9 +471,9 @@ - + + -