From 0807b7009b4c16c5db3cd76614c4296dc03ebed5 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 7 Nov 2014 15:13:58 +0100 Subject: [PATCH] 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 @@ + @@ -75,10 +76,12 @@ + + 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 @@ - - @@ -268,7 +266,6 @@ -