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

Skip song intro only in case of a quick restart

Browse Source
This commit is contained in:
BlauFx 2022-08-06 17:02:45 +02:00
parent e411a2d187
commit 0d418559bc
No known key found for this signature in database
GPG Key ID: BB73374479D2AA97
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Play/Player.cs
View File

@ -81,6 +81,10 @@ namespace osu.Game.Screens.Play
private bool isRestarting; private bool isRestarting;
public bool RestartedViaHotkey;
public Bindable<bool> IsRestartingFromHotkey = new Bindable<bool>();
private Bindable<bool> mouseWheelDisabled; private Bindable<bool> mouseWheelDisabled;
private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>(); private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
@ -287,6 +291,7 @@ namespace osu.Game.Screens.Play
{ {
if (!this.IsCurrentScreen()) return; if (!this.IsCurrentScreen()) return;
IsRestartingFromHotkey.Value = true;
fadeOut(true); fadeOut(true);
Restart(); Restart();
}, },
@ -368,7 +373,7 @@ namespace osu.Game.Screens.Play
skipIntroOverlay.IsSkippable.ValueChanged += (e) => skipIntroOverlay.IsSkippable.ValueChanged += (e) =>
{ {
if (RestartCount > 0 && e.NewValue) if (RestartedViaHotkey && e.NewValue && RestartCount > 0)
skipIntroOverlay.RequestSkip.Invoke(); skipIntroOverlay.RequestSkip.Invoke();
}; };
} }

13
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -123,6 +123,8 @@ namespace osu.Game.Screens.Play
private EpilepsyWarning? epilepsyWarning; private EpilepsyWarning? epilepsyWarning;
private bool isHotKeyRestart;
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private INotificationOverlay? notificationOverlay { get; set; } private INotificationOverlay? notificationOverlay { get; set; }
@ -363,9 +365,20 @@ namespace osu.Game.Screens.Play
CurrentPlayer = createPlayer(); CurrentPlayer = createPlayer();
CurrentPlayer.RestartCount = restartCount++; CurrentPlayer.RestartCount = restartCount++;
CurrentPlayer.RestartRequested = restartRequested; CurrentPlayer.RestartRequested = restartRequested;
CurrentPlayer.IsRestartingFromHotkey.ValueChanged += e =>
{
if (e.NewValue)
isHotKeyRestart = true;
};
LoadTask = LoadComponentAsync(CurrentPlayer, _ => LoadTask = LoadComponentAsync(CurrentPlayer, _ =>
{ {
if (isHotKeyRestart)
{
CurrentPlayer.RestartedViaHotkey = true;
isHotKeyRestart = false;
}
MetadataInfo.Loading = false; MetadataInfo.Loading = false;
OnPlayerLoaded(); OnPlayerLoaded();
}); });