From bc9ac8f72a2a281cf43510cd8b81c825a423c27f Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Thu, 10 May 2018 20:47:25 -0300 Subject: [PATCH] Move multiplayer screens to osu.Game/Screens/Multi/Screens --- osu.Game/Screens/Menu/MainMenu.cs | 1 + osu.Game/Screens/Multi/{ => Screens}/Lobby.cs | 2 +- osu.Game/Screens/Multi/{ => Screens}/Match.cs | 6 +++--- osu.Game/Screens/Multi/{ => Screens}/MatchCreate.cs | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename osu.Game/Screens/Multi/{ => Screens}/Lobby.cs (90%) rename osu.Game/Screens/Multi/{ => Screens}/Match.cs (96%) rename osu.Game/Screens/Multi/{ => Screens}/MatchCreate.cs (91%) diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index b09b53063a..2baa26c676 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -15,6 +15,7 @@ using osu.Game.Screens.Direct; using osu.Game.Screens.Edit; using osu.Game.Screens.Multi; +using osu.Game.Screens.Multi.Screens; using osu.Game.Screens.Select; using osu.Game.Screens.Tournament; diff --git a/osu.Game/Screens/Multi/Lobby.cs b/osu.Game/Screens/Multi/Screens/Lobby.cs similarity index 90% rename from osu.Game/Screens/Multi/Lobby.cs rename to osu.Game/Screens/Multi/Screens/Lobby.cs index 80e682e9f9..dcda40e0d7 100644 --- a/osu.Game/Screens/Multi/Lobby.cs +++ b/osu.Game/Screens/Multi/Screens/Lobby.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace osu.Game.Screens.Multi +namespace osu.Game.Screens.Multi.Screens { public class Lobby : ScreenWhiteBox { diff --git a/osu.Game/Screens/Multi/Match.cs b/osu.Game/Screens/Multi/Screens/Match.cs similarity index 96% rename from osu.Game/Screens/Multi/Match.cs rename to osu.Game/Screens/Multi/Screens/Match.cs index eee302a115..4ba7fe9f6a 100644 --- a/osu.Game/Screens/Multi/Match.cs +++ b/osu.Game/Screens/Multi/Screens/Match.cs @@ -3,14 +3,14 @@ using System; using System.Collections.Generic; +using osu.Framework.Graphics; using osu.Framework.Screens; using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Play; -using OpenTK.Graphics; using osu.Game.Screens.Select; -using osu.Framework.Graphics; +using OpenTK.Graphics; -namespace osu.Game.Screens.Multi +namespace osu.Game.Screens.Multi.Screens { public class Match : ScreenWhiteBox { diff --git a/osu.Game/Screens/Multi/MatchCreate.cs b/osu.Game/Screens/Multi/Screens/MatchCreate.cs similarity index 91% rename from osu.Game/Screens/Multi/MatchCreate.cs rename to osu.Game/Screens/Multi/Screens/MatchCreate.cs index db528ae2a3..6b4e26d5e5 100644 --- a/osu.Game/Screens/Multi/MatchCreate.cs +++ b/osu.Game/Screens/Multi/Screens/MatchCreate.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace osu.Game.Screens.Multi +namespace osu.Game.Screens.Multi.Screens { public class MatchCreate : ScreenWhiteBox {