Update framework and add "Async" suffix to asynchronous methods

This commit is contained in:
Thomas Müller
2017-02-23 22:32:10 +01:00
parent c3ab467e24
commit 2689de0c0c
21 changed files with 35 additions and 35 deletions

View File

@ -322,10 +322,10 @@ namespace osu.Game.Overlays
updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
}
protected override void PerformLoad(Framework.Game game)
protected override void Load(Framework.Game game)
{
this.game = game;
base.PerformLoad(game);
base.Load(game);
}
Action pendingBeatmapSwitch;
@ -349,7 +349,7 @@ namespace osu.Game.Overlays
MusicControllerBackground newBackground;
(newBackground = new MusicControllerBackground(beatmap)).Preload(game, delegate
(newBackground = new MusicControllerBackground(beatmap)).LoadAsync(game, delegate
{
dragContainer.Add(newBackground);