RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #291 from peppy/mode-entering 

Move Intro logic to OnEntering in line with framework changes.
This commit is contained in:
Dean Herbert 2017-01-23 21:37:59 +09:00 committed by GitHub
parent 2025e8ef71 f8da718da8
commit 0fcdc7ec11
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 29c4a3f29ad06a90da14ddafba1884f8265412d8

4
osu.Game/OsuGame.cs
View File

@ -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

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

@ -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();