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

Merge branch 'master' of github.com:ppy/osu into general-fixes

Browse Source 
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
This commit is contained in:
Thomas Müller 2017-02-17 21:22:34 +01:00
commit 1198705a6f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Beatmap.cs
View File

@ -39,6 +39,9 @@ namespace osu.Game.Beatmaps
ControlPoint timingPoint = null; ControlPoint timingPoint = null;
foreach (var controlPoint in ControlPoints) foreach (var controlPoint in ControlPoints)
// Some beatmaps have the first timingPoint (accidentally) start after the first HitObject(s).
// This null check makes it so that the first ControlPoint that makes a timing change is used as
// the timingPoint for those HitObject(s).
if (controlPoint.Time <= time || timingPoint == null) if (controlPoint.Time <= time || timingPoint == null)
{ {
if (controlPoint.TimingChange) if (controlPoint.TimingChange)
@ -49,6 +52,7 @@ namespace osu.Game.Beatmaps
else overridePoint = controlPoint; else overridePoint = controlPoint;
} }
else break; else break;
}
return timingPoint; return timingPoint;
} }