h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:02:55 +08:00
Code Issues Releases Wiki Activity

Rename OnlinePlayScreen.LoungeSubScreen to Lounge

Browse Source
This commit is contained in:
Marvin Schürz 2023-10-04 08:37:22 +02:00
parent 6bd51b32b4
commit 6d97f89399
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
public void Join(Room room, string? password) public void Join(Room room, string? password)
{ {
LoungeSubScreen.Join(room, password); Lounge.Join(room, password);
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)

12
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay
// while leases may be taken out by a subscreen. // while leases may be taken out by a subscreen.
public override bool DisallowExternalBeatmapRulesetChanges => true; public override bool DisallowExternalBeatmapRulesetChanges => true;
protected LoungeSubScreen LoungeSubScreen; protected LoungeSubScreen Lounge;
private MultiplayerWaveContainer waves; private MultiplayerWaveContainer waves;
private ScreenStack screenStack; private ScreenStack screenStack;
@ -90,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay
screenStack.ScreenPushed += screenPushed; screenStack.ScreenPushed += screenPushed;
screenStack.ScreenExited += screenExited; screenStack.ScreenExited += screenExited;
screenStack.Push(LoungeSubScreen = CreateLounge()); screenStack.Push(Lounge = CreateLounge());
apiState.BindTo(API.State); apiState.BindTo(API.State);
apiState.BindValueChanged(onlineStateChanged, true); apiState.BindValueChanged(onlineStateChanged, true);
@ -121,10 +121,10 @@ namespace osu.Game.Screens.OnlinePlay
Mods.SetDefault(); Mods.SetDefault();
if (LoungeSubScreen.IsCurrentScreen()) if (Lounge.IsCurrentScreen())
LoungeSubScreen.OnEntering(e); Lounge.OnEntering(e);
else else
LoungeSubScreen.MakeCurrent(); Lounge.MakeCurrent();
} }
public override void OnResuming(ScreenTransitionEvent e) public override void OnResuming(ScreenTransitionEvent e)
@ -159,7 +159,7 @@ namespace osu.Game.Screens.OnlinePlay
public override bool OnExiting(ScreenExitEvent e) public override bool OnExiting(ScreenExitEvent e)
{ {
while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not Lounge.LoungeSubScreen) while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not LoungeSubScreen)
{ {
var subScreen = (Screen)screenStack.CurrentScreen; var subScreen = (Screen)screenStack.CurrentScreen;
if (subScreen.IsLoaded && subScreen.OnExiting(e)) if (subScreen.IsLoaded && subScreen.OnExiting(e))