More CI fixes

This commit is contained in:
ColdVolcano 2017-05-17 01:37:31 -05:00
parent 387d26a576
commit 198542465b

View File

@ -29,13 +29,10 @@ namespace osu.Game.Graphics.Containers
if (controlPoint != null) if (controlPoint != null)
{ {
double oldTimingPointStart = timingPointStart; double oldTimingPointStart = timingPointStart;
double beatLength; double beatLength = controlPoint.BeatLength;
int oldBeat = beat; int oldBeat = beat;
bool kiai; bool kiai = kiaiControlPoint?.KiaiMode ?? false;
beatLength = controlPoint.BeatLength;
timingPointStart = controlPoint.Time; timingPointStart = controlPoint.Time;
kiai = kiaiControlPoint?.KiaiMode ?? false;
beat = beatLength > min_beat_length ? (int)((currentTime - timingPointStart) / beatLength) : 0; beat = beatLength > min_beat_length ? (int)((currentTime - timingPointStart) / beatLength) : 0;
@ -44,7 +41,7 @@ namespace osu.Game.Graphics.Containers
if (currentTime <= timingPointStart) if (currentTime <= timingPointStart)
beat--; beat--;
if ((timingPointStart != oldTimingPointStart || beat != oldBeat) && (currentTime - timingPointStart) % (beatLength) <= seek_tolerance) if ((timingPointStart != oldTimingPointStart || beat != oldBeat) && (int)((currentTime - timingPointStart) % beatLength) <= seek_tolerance)
OnNewBeat(beat, beatLength, controlPoint.TimeSignature, kiai); OnNewBeat(beat, beatLength, controlPoint.TimeSignature, kiai);
} }
} }