From 52bb0e8c6bcd6ce44a9b8b16ed75c38e46a86eda Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 7 Nov 2014 15:15:47 +0100 Subject: [PATCH] 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 @@ + + + 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 @@ - - - @@ -474,9 +471,9 @@ - + + -