h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:25:11 +08:00
Code Issues Releases Wiki Activity

Move Intro logic to OnEntering in line with framework changes.

Browse Source
This commit is contained in:
Dean Herbert 2017-01-20 16:28:03 +08:00
parent 2025e8ef71
commit ae464fcace
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit f2eec2adf590d60e91dda77de6f11d757ad6055f
Subproject commit 88f1122429fc81c68b349aa7ad9b8f462c89b997

4
osu.Game/OsuGame.cs
View File

@ -110,11 +110,9 @@ namespace osu.Game
(modeStack = new Intro()).Preload(this, d =>
{
mainContent.Add(d);
modeStack.ModePushed += modeAdded;
modeStack.Exited += modeRemoved;
modeStack.DisplayAsRoot();
mainContent.Add(modeStack);
});
//overlay elements

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

@ -65,9 +65,10 @@ namespace osu.Game.Screens.Menu
bgm.Looping = true;
}
protected override void LoadComplete()
protected override void OnEntering(GameMode last)
{
base.LoadComplete();
base.OnEntering(last);
Scheduler.Add(delegate
{
welcome.Play();