h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 16:13:34 +08:00
Code Issues Releases Wiki Activity

Use override that was intended to steer global track control rather than local sets

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-01-08 12:54:16 +01:00
parent b869be2f46
commit b6ce57b777
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,8 @@ namespace osu.Game.Screens.Menu
Colour = Color4.Black
};
public override bool? AllowGlobalTrackControl => false;
protected IntroScreen([CanBeNull] Func<MainMenu> createNextScreen = null)
{
this.createNextScreen = createNextScreen;
@ -109,8 +111,6 @@ namespace osu.Game.Screens.Menu
// prevent user from changing beatmap while the intro is still running.
beatmap = Beatmap.BeginLease(false);
musicController.AllowTrackControl.Value = false;
MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);

4
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -49,6 +49,8 @@ namespace osu.Game.Screens.Menu
public override bool AllowExternalScreenChange => true;
public override bool? AllowGlobalTrackControl => true;
private Screen songSelect;
private MenuSideFlashes sideFlashes;
@ -241,8 +243,6 @@ namespace osu.Game.Screens.Menu
{
var track = musicController.CurrentTrack;
musicController.AllowTrackControl.Value = true;
// presume the track is the current beatmap's track. not sure how correct this assumption is but it has worked until now.
if (!track.IsRunning)
{