diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index a09f9860cb..478919272e 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -31,9 +31,9 @@ namespace osu.Desktop base.LoadComplete(); versionManager.LoadAsync(this); - ModeChanged += m => + ScreenChanged += s => { - if (!versionManager.IsAlive && m is Intro) + if (!versionManager.IsAlive && s is Intro) Add(versionManager); }; } diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 79ffcfcadf..8aa3a63d26 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -258,13 +258,13 @@ namespace osu.Game return false; } - public event Action ModeChanged; + public event Action ScreenChanged; private Container mainContent; private Container overlayContent; - private void modeChanged(Screen newScreen) + private void screenChanged(Screen newScreen) { //central game mode change logic. if ((newScreen as OsuScreen)?.ShowOverlays != true) @@ -281,7 +281,7 @@ namespace osu.Game if (newScreen is MainMenu) Cursor.FadeIn(100); - ModeChanged?.Invoke(newScreen); + ScreenChanged?.Invoke(newScreen); if (newScreen == null) Exit(); @@ -315,12 +315,12 @@ namespace osu.Game newScreen.ModePushed += screenAdded; newScreen.Exited += screenRemoved; - modeChanged(newScreen); + screenChanged(newScreen); } private void screenRemoved(Screen newScreen) { - modeChanged(newScreen); + screenChanged(newScreen); } } }