sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into osb_loading

Browse Source
This commit is contained in:
Thomas Müller
2017-02-12 12:26:25 +01:00
committed by GitHub
parent a504c73f33 ff6838f88c
commit e3f35cd66e
48 changed files with 1685 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Screens.Backgrounds
[BackgroundDependencyLoader]
private void load()
{
Sprite.Texture = beatmap.Background;
Sprite.Texture = beatmap?.Background;
}
}
}

6
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -119,11 +119,11 @@ namespace osu.Game.Screens.Menu
buttonFlow.Add(buttonsTopLevel);
}
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuGame game)
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuGame game = null)
{
sampleOsuClick = audio.Sample.Get(@"Menu/menuhit");
toolbar = game.Toolbar;
toolbar = game?.Toolbar;
}
protected override void LoadComplete()