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

Minor variable name changes

Browse Source
This commit is contained in:
Dean Herbert 2019-08-06 23:05:12 +09:00
parent 5cbd887ee8
commit dda078277a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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