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

Remove the synchronous version of PrepareScoreForResults

Browse Source 
Replaces all existing usages with the `async` version.
This commit is contained in:
Dean Herbert 2021-06-18 16:24:07 +09:00
parent 2cd72a92e8
commit 45122594e5
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Screens; using osu.Framework.Screens;
@ -54,9 +55,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
return new PlaylistsResultsScreen(score, RoomId.Value.Value, PlaylistItem, true); return new PlaylistsResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
} }
protected override void PrepareScoreForResults(Score score) protected override async Task PrepareScoreForResultsAsync(Score score)
{ {
base.PrepareScoreForResults(score); await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
Score.ScoreInfo.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore()); Score.ScoreInfo.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
} }

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

@ -626,7 +626,7 @@ namespace osu.Game.Screens.Play
/// <summary> /// <summary>
/// This delegate, when set, means the results screen has been queued to appear. /// This delegate, when set, means the results screen has been queued to appear.
/// The display of the results screen may be delayed by any work being done in <see cref="PrepareScoreForResults"/> and <see cref="PrepareScoreForResultsAsync"/>. /// The display of the results screen may be delayed by any work being done in <see cref="PrepareScoreForResultsAsync"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Once set, this can *only* be cancelled by rewinding, ie. if <see cref="JudgementProcessor.HasCompleted">ScoreProcessor.HasCompleted</see> becomes <see langword="false"/>. /// Once set, this can *only* be cancelled by rewinding, ie. if <see cref="JudgementProcessor.HasCompleted">ScoreProcessor.HasCompleted</see> becomes <see langword="false"/>.
@ -706,9 +706,6 @@ namespace osu.Game.Screens.Play
private async Task<ScoreInfo> prepareScoreForResults() private async Task<ScoreInfo> prepareScoreForResults()
{ {
// ReSharper disable once MethodHasAsyncOverload
PrepareScoreForResults(Score);
try try
{ {
await PrepareScoreForResultsAsync(Score).ConfigureAwait(false); await PrepareScoreForResultsAsync(Score).ConfigureAwait(false);
@ -1007,22 +1004,15 @@ namespace osu.Game.Screens.Play
/// <summary> /// <summary>
/// Prepare the <see cref="Scoring.Score"/> for display at results. /// Prepare the <see cref="Scoring.Score"/> for display at results.
/// </summary> /// </summary>
/// <remarks>
/// This is run synchronously before <see cref="PrepareScoreForResultsAsync"/> is run.
/// </remarks>
/// <param name="score">The <see cref="Scoring.Score"/> to prepare.</param> /// <param name="score">The <see cref="Scoring.Score"/> to prepare.</param>
protected virtual void PrepareScoreForResults(Score score) /// <returns>A task that prepares the provided score. On completion, the score is assumed to be ready for display.</returns>
protected virtual Task PrepareScoreForResultsAsync(Score score)
{ {
// perform one final population to ensure everything is up-to-date. // perform one final population to ensure everything is up-to-date.
ScoreProcessor.PopulateScore(score.ScoreInfo); ScoreProcessor.PopulateScore(score.ScoreInfo);
}
/// <summary> return Task.CompletedTask;
/// Prepare the <see cref="Scoring.Score"/> for display at results. }
/// </summary>
/// <param name="score">The <see cref="Scoring.Score"/> to prepare.</param>
/// <returns>A task that prepares the provided score. On completion, the score is assumed to be ready for display.</returns>
protected virtual Task PrepareScoreForResultsAsync(Score score) => Task.CompletedTask;
/// <summary> /// <summary>
/// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>. /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.