mirror of
https://github.com/ppy/osu
synced 2025-02-15 17:47:28 +00:00
Make currentEffectPoint
non-nullable
This commit is contained in:
parent
d389808427
commit
5a4196fd51
@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects
|
|||||||
for (int i = 0; i < timingPoints.Count; i++)
|
for (int i = 0; i < timingPoints.Count; i++)
|
||||||
{
|
{
|
||||||
TimingControlPoint currentTimingPoint = timingPoints[i];
|
TimingControlPoint currentTimingPoint = timingPoints[i];
|
||||||
EffectControlPoint? currentEffectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTimingPoint.Time);
|
EffectControlPoint currentEffectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTimingPoint.Time);
|
||||||
int currentBeat = 0;
|
int currentBeat = 0;
|
||||||
|
|
||||||
// Stop on the next timing point, or if there is no next timing point stop slightly past the last object
|
// Stop on the next timing point, or if there is no next timing point stop slightly past the last object
|
||||||
@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Objects
|
|||||||
double startTime = currentTimingPoint.Time;
|
double startTime = currentTimingPoint.Time;
|
||||||
double barLength = currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator;
|
double barLength = currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator;
|
||||||
|
|
||||||
if (currentEffectPoint != null && currentEffectPoint.OmitFirstBarLine)
|
if (currentEffectPoint.OmitFirstBarLine)
|
||||||
{
|
{
|
||||||
startTime += barLength;
|
startTime += barLength;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user