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

Remove manual overlay/toolbar logic from multiplayer

Browse Source
This commit is contained in:
smoogipoo 2019-01-31 13:38:21 +09:00
parent aac921c298
commit 58d744e5dc
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -46,8 +46,6 @@ namespace osu.Game.Screens.Multi
private readonly LoungeSubScreen loungeSubScreen; private readonly LoungeSubScreen loungeSubScreen;
private readonly ScreenStack screenStack; private readonly ScreenStack screenStack;
private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>();
[Cached(Type = typeof(IRoomManager))] [Cached(Type = typeof(IRoomManager))]
private RoomManager roomManager; private RoomManager roomManager;
@ -57,9 +55,6 @@ namespace osu.Game.Screens.Multi
[Resolved] [Resolved]
private OsuGameBase game { get; set; } private OsuGameBase game { get; set; }
[Resolved]
private OsuGame osuGame { get; set; }
[Resolved] [Resolved]
private APIAccess api { get; set; } private APIAccess api { get; set; }
@ -142,9 +137,6 @@ namespace osu.Game.Screens.Multi
if (idleTracker != null) if (idleTracker != null)
isIdle.BindTo(idleTracker.IsIdle); isIdle.BindTo(idleTracker.IsIdle);
if (osuGame != null)
overlayActivationMode.BindTo(osuGame.OverlayActivationMode);
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -181,8 +173,6 @@ namespace osu.Game.Screens.Multi
{ {
this.FadeIn(); this.FadeIn();
osuGame.Toolbar.State = Visibility.Visible;
waves.Show(); waves.Show();
} }
@ -212,9 +202,6 @@ namespace osu.Game.Screens.Multi
logo?.AppendAnimatingAction(() => OsuScreen.ApplyLogoArrivingDefaults(logo), true); logo?.AppendAnimatingAction(() => OsuScreen.ApplyLogoArrivingDefaults(logo), true);
overlayActivationMode.Value = OverlayActivation.All;
osuGame.Toolbar.State = Visibility.Visible;
updatePollingRate(isIdle.Value); updatePollingRate(isIdle.Value);
} }