h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-21 21:47:20 +08:00
Code Issues Releases Wiki Activity

onCompletionEvent -> pushResults

Browse Source
This commit is contained in:
iiSaLMaN 2019-08-06 14:11:43 +03:00
parent dd701eaa62
commit 2a68bb2749
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Play/Player.cs
View File

@ -255,7 +255,7 @@ namespace osu.Game.Screens.Play
private void performImmediateExit()
{
// if a restart has been requested, cancel any pending completion (user has shown intent to restart).
onCompletionEvent?.Cancel();
pushResults?.Cancel();
ValidForResume = false;
@ -279,12 +279,12 @@ namespace osu.Game.Screens.Play
performImmediateExit();
}
private ScheduledDelegate onCompletionEvent;
private ScheduledDelegate pushResults;
private void onCompletion()
{
// Only show the completion screen if the player hasn't failed
if (ScoreProcessor.HasFailed || onCompletionEvent != null)
if (ScoreProcessor.HasFailed || pushResults != null)
return;
ValidForResume = false;
@ -293,7 +293,7 @@ namespace osu.Game.Screens.Play
using (BeginDelayedSequence(1000))
{
onCompletionEvent = Schedule(delegate
pushResults = Schedule(delegate
{
if (!this.IsCurrentScreen()) return;
@ -465,10 +465,10 @@ namespace osu.Game.Screens.Play
public override bool OnExiting(IScreen next)
{
if (onCompletionEvent != null && !onCompletionEvent.Cancelled && !onCompletionEvent.Completed)
if (pushResults != null && !pushResults.Cancelled && !pushResults.Completed)
// proceed to result screen if beatmap already finished playing
{
onCompletionEvent.RunTask();
pushResults.RunTask();
return true;
}