h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Refactor updateCompletionState implementation for legibility and code share

Browse Source
This commit is contained in:
Dean Herbert 2020-04-21 11:51:20 +09:00
parent 5a2129da7c
commit a91c63819b
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/Play/Player.cs
View File

@ -423,8 +423,6 @@ namespace osu.Game.Screens.Play
if (!this.IsCurrentScreen())
return;
// cancel push delegate in case judges reverted
// after delegate may have already been scheduled.
if (!completionState.NewValue)
{
completionProgressDelegate?.Cancel();
@ -433,8 +431,11 @@ namespace osu.Game.Screens.Play
return;
}
if (completionProgressDelegate != null)
throw new InvalidOperationException($"{nameof(updateCompletionState)} was fired more than once");
// Only show the completion screen if the player hasn't failed
if (HealthProcessor.HasFailed || completionProgressDelegate != null)
if (HealthProcessor.HasFailed)
return;
ValidForResume = false;
@ -442,7 +443,7 @@ namespace osu.Game.Screens.Play
if (!showResults) return;
using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
scheduleGotoRanking();
completionProgressDelegate = Schedule(GotoRanking);
}
protected virtual ScoreInfo CreateScore()
@ -694,12 +695,6 @@ namespace osu.Game.Screens.Play
storyboardReplacesBackground.Value = false;
}
private void scheduleGotoRanking()
{
completionProgressDelegate?.Cancel();
completionProgressDelegate = Schedule(GotoRanking);
}
#endregion
}
}