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

Merge pull request #20203 from peppy/fix-beat-sync-stop

Browse Source 
Fix beat sync stopping after returning to menu from a failed play
This commit is contained in:
Dan Balasescu 2022-09-09 15:37:46 +09:00 committed by GitHub
commit 2bd23d7499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Beatmaps/FramedBeatmapClock.cs
View File

@ -121,7 +121,18 @@ namespace osu.Game.Beatmaps
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
finalClockSource.ProcessFrame();
if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime)
{
// InterpolatingFramedClock won't interpolate backwards unless its source has an ElapsedFrameTime.
// See https://github.com/ppy/osu-framework/blob/ba1385330cc501f34937e08257e586c84e35d772/osu.Framework/Timing/InterpolatingFramedClock.cs#L91-L93
// This is not always the case here when doing large seeks.
// (Of note, this is not an issue if the source is adjustable, as the source is seeked to be in time by DecoupleableInterpolatingFramedClock).
// Rather than trying to get around this by fixing the framework clock stack, let's work around it for now.
Seek(Source.CurrentTime);
}
else
finalClockSource.ProcessFrame();
} }
public double TotalAppliedOffset public double TotalAppliedOffset

5
osu.Game/OsuGameBase.cs
View File

@ -390,11 +390,6 @@ namespace osu.Game
var framedClock = new FramedClock(beatmap.Track); var framedClock = new FramedClock(beatmap.Track);
beatmapClock.ChangeSource(framedClock); beatmapClock.ChangeSource(framedClock);
// Normally the internal decoupled clock will seek the *track* to the decoupled time, but we blocked this.
// It won't behave nicely unless we also set it to the track's time.
// Probably another thing which should be fixed in the decoupled mess (or just replaced).
beatmapClock.Seek(beatmap.Track.CurrentTime);
} }
protected virtual void InitialiseFonts() protected virtual void InitialiseFonts()