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

Fix compilation error introduced in merge conflict resolution.

Browse Source
This commit is contained in:
Thomas Müller 2017-02-17 21:27:17 +01:00
parent 04de28d8b2
commit ef775458dd
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ 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). // 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 // This null check makes it so that the first ControlPoint that makes a timing change is used as
// the timingPoint for those HitObject(s). // the timingPoint for those HitObject(s).