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

Rename {Multiplayer -> OnlinePlay}Screen

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-12-25 17:00:00 +01:00
parent 83fb7c7a1a
commit 4caf75850b
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
private CachedModelDependencyContainer<Room> dependencies;
[Resolved(canBeNull: true)]
private MultiplayerScreen multiplayer { get; set; }
private OnlinePlayScreen parentScreen { get; set; }
[Resolved]
private BeatmapManager beatmaps { get; set; }
@ -242,7 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{
new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
{
multiplayer?.OpenNewRoom(Room.CreateCopy());
parentScreen?.OpenNewRoom(Room.CreateCopy());
})
};
}

4
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
private BeatmapManager beatmapManager { get; set; }
[Resolved(canBeNull: true)]
protected MultiplayerScreen Multiplayer { get; private set; }
protected OnlinePlayScreen ParentScreen { get; private set; }
private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
@ -88,7 +88,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
protected void StartPlay(Func<Player> player)
{
sampleStart?.Play();
Multiplayer?.Push(new PlayerLoader(player));
ParentScreen?.Push(new PlayerLoader(player));
}
private void selectedItemChanged()

2
osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
View File

@ -13,7 +13,7 @@ using osu.Game.Screens.OnlinePlay.Lounge;
namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
public class Multiplayer : MultiplayerScreen
public class Multiplayer : OnlinePlayScreen
{
[Resolved]
private StatefulMultiplayerClient client { get; set; }

4
osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs → osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -27,7 +27,7 @@ using osuTK;
namespace osu.Game.Screens.OnlinePlay
{
[Cached]
public abstract class MultiplayerScreen : OsuScreen
public abstract class OnlinePlayScreen : OsuScreen
{
public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay
private readonly Drawable header;
private readonly Drawable headerBackground;
protected MultiplayerScreen()
protected OnlinePlayScreen()
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;

2
osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
View File

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

5
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
View File

@ -28,9 +28,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
[Resolved(typeof(Room), nameof(Room.RoomID))]
private Bindable<int?> roomId { get; set; }
[Resolved(canBeNull: true)]
private MultiplayerScreen multiplayer { get; set; }
private MatchSettingsOverlay settingsOverlay;
private MatchLeaderboard leaderboard;
@ -124,7 +121,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
RequestShowResults = item =>
{
Debug.Assert(roomId.Value != null);
multiplayer?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
ParentScreen?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
}
}
},