h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:52:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #11288 from bdach/token-failure-crash-pt2

Browse Source 
Always create realtime-specific player elements regardless of token
This commit is contained in:
Dean Herbert 2020-12-24 23:09:35 +09:00 committed by GitHub
commit 1a3ef9da6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
View File

@ -4,7 +4,6 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Logging;
@ -35,7 +34,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
[CanBeNull]
private MultiplayerGameplayLeaderboard leaderboard;
private readonly int[] userIds;
@ -61,6 +59,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
[BackgroundDependencyLoader]
private void load()
{
// todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
if (Token == null)
return; // Todo: Somehow handle token retrieval failure.
@ -84,11 +87,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
}, true);
Debug.Assert(client.Room != null);
// todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
}
protected override void StartGameplay()
@ -115,9 +113,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
private void adjustLeaderboardPosition()
{
if (leaderboard == null)
return;
const float padding = 44; // enough margin to avoid the hit error display.
leaderboard.Position = new Vector2(