Use correct effect points when EarlyActivationMilliseconds is not zero

This commit is contained in:
ColdVolcano
2021-12-04 22:31:55 -06:00
parent 7f68d81c85
commit 81215b9f0e

View File

@ -111,7 +111,7 @@ namespace osu.Game.Graphics.Containers
if (clock == null) if (clock == null)
return; return;
double currentTrackTime = clock.CurrentTime; double currentTrackTime = clock.CurrentTime + EarlyActivationMilliseconds;
if (Beatmap.Value.TrackLoaded && Beatmap.Value.BeatmapLoaded) if (Beatmap.Value.TrackLoaded && Beatmap.Value.BeatmapLoaded)
{ {
@ -132,13 +132,11 @@ namespace osu.Game.Graphics.Containers
{ {
// this may be the case where the beat syncing clock has been paused. // this may be the case where the beat syncing clock has been paused.
// we still want to show an idle animation, so use this container's time instead. // we still want to show an idle animation, so use this container's time instead.
currentTrackTime = Clock.CurrentTime; currentTrackTime = Clock.CurrentTime + EarlyActivationMilliseconds;
timingPoint = TimingControlPoint.DEFAULT; timingPoint = TimingControlPoint.DEFAULT;
effectPoint = EffectControlPoint.DEFAULT; effectPoint = EffectControlPoint.DEFAULT;
} }
currentTrackTime += EarlyActivationMilliseconds;
double beatLength = timingPoint.BeatLength / Divisor; double beatLength = timingPoint.BeatLength / Divisor;
while (beatLength < MinimumBeatLength) while (beatLength < MinimumBeatLength)