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

Fix track adjusments being reset incorrectly

Browse Source
This commit is contained in:
smoogipoo 2020-09-01 18:07:19 +09:00
parent 26b4226b55
commit 7e1844ed77
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,9 @@ namespace osu.Game.Screens.Play
[Resolved] [Resolved]
private IAPIProvider api { get; set; } private IAPIProvider api { get; set; }
[Resolved]
private MusicController musicController { get; set; }
private SampleChannel sampleRestart; private SampleChannel sampleRestart;
public BreakOverlay BreakOverlay; public BreakOverlay BreakOverlay;
@ -631,9 +634,12 @@ namespace osu.Game.Screens.Play
foreach (var mod in Mods.Value.OfType<IApplicableToHUD>()) foreach (var mod in Mods.Value.OfType<IApplicableToHUD>())
mod.ApplyToHUD(HUDOverlay); mod.ApplyToHUD(HUDOverlay);
Beatmap.Value.Track.ResetSpeedAdjustments(); // Our mods are local copies of the global mods so they need to be re-applied to the track.
// This is done through the music controller (for now), because resetting speed adjustments on the beatmap track also removes adjustments provided by DrawableTrack.
// Todo: In the future, player will receive in a track and will probably not have to worry about this...
musicController.ResetTrackAdjustments();
foreach (var mod in Mods.Value.OfType<IApplicableToTrack>()) foreach (var mod in Mods.Value.OfType<IApplicableToTrack>())
mod.ApplyToTrack(Beatmap.Value.Track); mod.ApplyToTrack(musicController.CurrentTrack);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(IScreen next)
@ -667,7 +673,7 @@ namespace osu.Game.Screens.Play
// as we are no longer the current screen, we cannot guarantee the track is still usable. // as we are no longer the current screen, we cannot guarantee the track is still usable.
GameplayClockContainer?.StopUsingBeatmapClock(); GameplayClockContainer?.StopUsingBeatmapClock();
Beatmap.Value.Track.ResetSpeedAdjustments(); musicController.ResetTrackAdjustments();
fadeOut(); fadeOut();
return base.OnExiting(next); return base.OnExiting(next);