From ae464fcace4f86486f24b98d0a0b6a1d7e45f984 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 20 Jan 2017 16:28:03 +0800 Subject: [PATCH 1/2] Move Intro logic to OnEntering in line with framework changes. --- osu-framework | 2 +- osu.Game/OsuGame.cs | 4 +--- osu.Game/Screens/Menu/Intro.cs | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/osu-framework b/osu-framework index f2eec2adf5..88f1122429 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit f2eec2adf590d60e91dda77de6f11d757ad6055f +Subproject commit 88f1122429fc81c68b349aa7ad9b8f462c89b997 diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index a4ca4c5817..c852a41e3b 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -110,11 +110,9 @@ protected override void LoadComplete() (modeStack = new Intro()).Preload(this, d => { - mainContent.Add(d); - modeStack.ModePushed += modeAdded; modeStack.Exited += modeRemoved; - modeStack.DisplayAsRoot(); + mainContent.Add(modeStack); }); //overlay elements diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index ca85546b10..b0d92d693b 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -65,9 +65,10 @@ private void load(AudioManager audio) bgm.Looping = true; } - protected override void LoadComplete() + protected override void OnEntering(GameMode last) { - base.LoadComplete(); + base.OnEntering(last); + Scheduler.Add(delegate { welcome.Play(); From f8da718da8b7aed0295a24eb80f80efd0f3c7eea Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 23 Jan 2017 21:26:03 +0900 Subject: [PATCH 2/2] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 88f1122429..29c4a3f29a 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 88f1122429fc81c68b349aa7ad9b8f462c89b997 +Subproject commit 29c4a3f29ad06a90da14ddafba1884f8265412d8