sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +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

6
osu.Game/Overlays/MusicController.cs
View File

@ -320,10 +320,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;
@ -347,7 +347,7 @@ namespace osu.Game.Overlays
MusicControllerBackground newBackground;
(newBackground = new MusicControllerBackground(beatmap)).Preload(game, delegate
(newBackground = new MusicControllerBackground(beatmap)).LoadAsync(game, delegate
{
dragContainer.Add(newBackground);