h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-failing-pause-tests

Browse Source
This commit is contained in:
Dean Herbert 2019-05-10 18:22:20 +09:00 committed by GitHub
commit af3a75307d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.UI
public virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer();
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, CancellationToken cancellationToken)
private void load(OsuConfigManager config, CancellationToken? cancellationToken)
{
InternalChildren = new Drawable[]
{
@ -170,18 +170,15 @@ namespace osu.Game.Rulesets.UI
/// <summary>
/// Creates and adds drawable representations of hit objects to the play field.
/// </summary>
private void loadObjects(CancellationToken cancellationToken)
private void loadObjects(CancellationToken? cancellationToken)
{
foreach (TObject h in Beatmap.HitObjects)
{
if (cancellationToken.IsCancellationRequested)
break;
cancellationToken?.ThrowIfCancellationRequested();
addHitObject(h);
}
if (cancellationToken.IsCancellationRequested)
return;
cancellationToken?.ThrowIfCancellationRequested();
Playfield.PostProcess();

5
osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Storyboards.Drawables
}
[BackgroundDependencyLoader(true)]
private void load(FileStore fileStore, GameplayClock clock, CancellationToken cancellationToken)
private void load(FileStore fileStore, GameplayClock clock, CancellationToken? cancellationToken)
{
if (clock != null)
Clock = clock;
@ -67,8 +67,7 @@ namespace osu.Game.Storyboards.Drawables
foreach (var layer in Storyboard.Layers)
{
if (cancellationToken.IsCancellationRequested)
break;
cancellationToken?.ThrowIfCancellationRequested();
Add(layer.CreateDrawable());
}

5
osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
View File

@ -25,12 +25,11 @@ namespace osu.Game.Storyboards.Drawables
}
[BackgroundDependencyLoader]
private void load(CancellationToken cancellationToken)
private void load(CancellationToken? cancellationToken)
{
foreach (var element in Layer.Elements)
{
if (cancellationToken.IsCancellationRequested)
break;
cancellationToken?.ThrowIfCancellationRequested();
if (element.IsDrawable)
AddInternal(element.CreateDrawable());