sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into remove-usings

Browse Source
This commit is contained in:
Dean Herbert
2017-02-24 11:29:34 +09:00
parent a5dfa7ab06 a8135332d6
commit c5552dfb27
25 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -56,7 +56,7 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(OsuGame game)
{
background.Preload(game);
background.LoadAsync(game);
buttons.OnSettings = game.ToggleOptions;
}