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

Update async load usage to new style.

Browse Source
This commit is contained in:
Dean Herbert
2017-04-02 15:56:12 +09:00
parent 9bd19e99ee
commit 6f1fff4ee7
18 changed files with 146 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -88,9 +88,9 @@ namespace osu.Game.Screens.Menu
}
[BackgroundDependencyLoader]
private void load(OsuGame game, OsuColour colours)
private void load(OsuColour colours)
{
(intro = new Intro()).LoadAsync(game);
LoadComponentAsync(intro = new Intro());
iconColour = colours.Yellow;
}

2
osu.Game/Screens/Menu/Intro.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Screens.Menu
{
bgm.Start();
(mainMenu = new MainMenu()).LoadAsync(Game);
LoadComponentAsync(mainMenu = new MainMenu());
Scheduler.AddDelayed(delegate
{

7
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(OsuGame game)
{
background.LoadAsync(game);
LoadComponentAsync(background);
buttons.OnSettings = game.ToggleOptions;
@ -67,10 +67,7 @@ namespace osu.Game.Screens.Menu
private void preloadSongSelect()
{
if (songSelect == null)
{
songSelect = new PlaySongSelect();
songSelect.LoadAsync(Game);
}
LoadComponentAsync(songSelect = new PlaySongSelect());
}
private Screen consumeSongSelect()