sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Unify and smiplify exit logic. Now only OsuGame calls the final Exit.

Browse Source
This commit is contained in:
Dean Herbert
2016-10-07 18:46:05 +09:00
parent c5ac851ba9
commit c5228b63cb
4 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/GameModes/Menu/Intro.cs
View File

@ -69,11 +69,8 @@ namespace osu.Game.GameModes.Menu
protected override void OnResuming(GameMode last) protected override void OnResuming(GameMode last)
{ {
//this is an exit //we are just an intro. if we are resumed, we just want to exit after a short delay (to allow the last mode to transition out).
Game.Scheduler.AddDelayed(delegate Game.Scheduler.AddDelayed(Exit, 300);
{
Game.Exit();
}, 300);
base.OnResuming(last); base.OnResuming(last);
} }

6
osu.Game/GameModes/Menu/MainMenu.cs
View File

@ -47,11 +47,7 @@ namespace osu.Game.GameModes.Menu
OnSolo = delegate { Push(new PlaySongSelect()); }, OnSolo = delegate { Push(new PlaySongSelect()); },
OnMulti = delegate { Push(new Lobby()); }, OnMulti = delegate { Push(new Lobby()); },
OnTest = delegate { Push(new TestBrowser()); }, OnTest = delegate { Push(new TestBrowser()); },
OnExit = delegate { OnExit = delegate { Game.Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); },
Game.Scheduler.AddDelayed(delegate {
Exit();
}, ButtonSystem.EXIT_DELAY);
},
OnSettings = delegate { OnSettings = delegate {
osu.Options.PoppedOut = !osu.Options.PoppedOut; osu.Options.PoppedOut = !osu.Options.PoppedOut;
}, },

11
osu.Game/GameModes/OsuGameMode.cs
View File

@ -64,16 +64,5 @@ namespace osu.Game.GameModes
base.OnExiting(next); base.OnExiting(next);
} }
protected override void OnResuming(GameMode last)
{
base.OnResuming(last);
}
protected override void OnSuspending(GameMode next)
{
base.OnSuspending(next);
}
} }
} }

4
osu.Game/OsuGame.cs
View File

@ -60,6 +60,7 @@ namespace osu.Game
}); });
intro.ModePushed += modeAdded; intro.ModePushed += modeAdded;
intro.Exited += modeRemoved;
PlayMode = Config.GetBindable<PlayMode>(OsuConfig.PlayMode); PlayMode = Config.GetBindable<PlayMode>(OsuConfig.PlayMode);
PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); }; PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); };
@ -89,6 +90,9 @@ namespace osu.Game
Cursor.FadeIn(100); Cursor.FadeIn(100);
ModeChanged?.Invoke(newMode); ModeChanged?.Invoke(newMode);
if (newMode == null)
Host.Exit();
} }
private void modeAdded(GameMode newMode) private void modeAdded(GameMode newMode)