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

Update framework and add "Async" suffix to asynchronous methods

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/OsuGame.cs
View File

@ -116,7 +116,7 @@ namespace osu.Game
}
});
(screenStack = new Loader()).Preload(this, d =>
(screenStack = new Loader()).LoadAsync(this, d =>
{
screenStack.ModePushed += screenAdded;
screenStack.Exited += screenRemoved;
@ -124,22 +124,22 @@ namespace osu.Game
});
//overlay elements
(chat = new ChatOverlay { Depth = 0 }).Preload(this, overlayContent.Add);
(options = new OptionsOverlay { Depth = -1 }).Preload(this, overlayContent.Add);
(chat = new ChatOverlay { Depth = 0 }).LoadAsync(this, overlayContent.Add);
(options = new OptionsOverlay { Depth = -1 }).LoadAsync(this, overlayContent.Add);
(musicController = new MusicController()
{
Depth = -2,
Position = new Vector2(0, Toolbar.HEIGHT),
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}).Preload(this, overlayContent.Add);
}).LoadAsync(this, overlayContent.Add);
(notificationManager = new NotificationManager
{
Depth = -2,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}).Preload(this, overlayContent.Add);
}).LoadAsync(this, overlayContent.Add);
Logger.NewEntry += entry =>
{
@ -160,7 +160,7 @@ namespace osu.Game
Depth = -3,
OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
}).Preload(this, t =>
}).LoadAsync(this, t =>
{
PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); };
PlayMode.TriggerChange();