h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 11:52:54 +08:00
Code Issues Releases Wiki Activity

PlaylistsMultiplayer -> Playlists

Browse Source
This commit is contained in:
Dean Herbert 2020-12-25 23:45:44 +09:00
parent 8a36eab060
commit 836d1491d0
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
View File

@ -11,7 +11,6 @@ using osu.Game.Beatmaps;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Overlays.Mods; using osu.Game.Overlays.Mods;
using osu.Game.Overlays.Toolbar; using osu.Game.Overlays.Toolbar;
using osu.Game.Screens.Multi.Playlists;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osu.Game.Screens.Select; using osu.Game.Screens.Select;
using osu.Game.Screens.Select.Options; using osu.Game.Screens.Select.Options;
@ -108,14 +107,14 @@ namespace osu.Game.Tests.Visual.Navigation
[Test] [Test]
public void TestExitMultiWithEscape() public void TestExitMultiWithEscape()
{ {
PushAndConfirm(() => new PlaylistsMultiplayer()); PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
exitViaEscapeAndConfirm(); exitViaEscapeAndConfirm();
} }
[Test] [Test]
public void TestExitMultiWithBackButton() public void TestExitMultiWithBackButton()
{ {
PushAndConfirm(() => new PlaylistsMultiplayer()); PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
exitViaBackButtonAndConfirm(); exitViaBackButtonAndConfirm();
} }

3
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
View File

@ -4,7 +4,6 @@
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Screens.Multi.Playlists;
namespace osu.Game.Tests.Visual.Playlists namespace osu.Game.Tests.Visual.Playlists
{ {
@ -18,7 +17,7 @@ namespace osu.Game.Tests.Visual.Playlists
public TestScenePlaylistsScreen() public TestScenePlaylistsScreen()
{ {
var multi = new PlaylistsMultiplayer(); var multi = new Screens.Multi.Playlists.Playlists();
AddStep("show", () => LoadScreen(multi)); AddStep("show", () => LoadScreen(multi));
AddUntilStep("wait for loaded", () => multi.IsLoaded); AddUntilStep("wait for loaded", () => multi.IsLoaded);

2
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
}, },
OnSolo = onSolo, OnSolo = onSolo,
OnMultiplayer = () => this.Push(new Multiplayer()), OnMultiplayer = () => this.Push(new Multiplayer()),
OnPlaylists = () => this.Push(new PlaylistsMultiplayer()), OnPlaylists = () => this.Push(new Playlists()),
OnExit = confirmAndExit, OnExit = confirmAndExit,
} }
} }

2
osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs → osu.Game/Screens/Multi/Playlists/Playlists.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Screens.Multi.Match;
namespace osu.Game.Screens.Multi.Playlists namespace osu.Game.Screens.Multi.Playlists
{ {
public class PlaylistsMultiplayer : MultiplayerScreen public class Playlists : MultiplayerScreen
{ {
protected override void UpdatePollingRate(bool isIdle) protected override void UpdatePollingRate(bool isIdle)
{ {