h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 14:42:56 +08:00
Code Issues Releases Wiki Activity

Remaining GameMode -> Screen.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-03-14 07:22:46 +08:00
parent 3913a0a9ee
commit e1bd168c16
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Desktop/OsuGameDesktop.cs
View File

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

10
osu.Game/OsuGame.cs
View File

@ -258,13 +258,13 @@ namespace osu.Game
return false;
}
public event Action<Screen> ModeChanged;
public event Action<Screen> 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);
}
}
}