h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 21:13:20 +08:00
Code Issues Releases Wiki Activity

Allow closing the game during intro

Browse Source
This commit is contained in:
Dean Herbert 2020-04-30 12:12:28 +09:00
parent 1cb3f39f60
commit 21c6ac8c43
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/OsuGame.cs
View File

@ -914,10 +914,7 @@ namespace osu.Game
if (ScreenStack.CurrentScreen is Loader) if (ScreenStack.CurrentScreen is Loader)
return false; return false;
if (introScreen == null) if (introScreen.DidLoadMenu && !(ScreenStack.CurrentScreen is IntroScreen))
return true;
if (!introScreen.DidLoadMenu || !(ScreenStack.CurrentScreen is IntroScreen))
{ {
Scheduler.Add(introScreen.MakeCurrent); Scheduler.Add(introScreen.MakeCurrent);
return true; return true;

2
osu.Game/Screens/Menu/IntroScreen.cs
View File

@ -96,8 +96,6 @@ namespace osu.Game.Screens.Menu
Track = introBeatmap.Track; Track = introBeatmap.Track;
} }
public override bool OnExiting(IScreen next) => !DidLoadMenu;
public override void OnResuming(IScreen last) public override void OnResuming(IScreen last)
{ {
this.FadeIn(300); this.FadeIn(300);