Move legacy_velocity_multiplier application to LegacyTimingInfo.

This commit is contained in:
Dean Herbert
2017-04-05 12:05:48 +09:00
parent abf6dbc307
commit 6a922da87e
4 changed files with 23 additions and 8 deletions

View File

@ -14,9 +14,11 @@ namespace osu.Game.Beatmaps.Timing
public TimeSignatures TimeSignature;
public double Time;
public double BeatLength;
public double VelocityAdjustment;
public double SpeedMultiplier;
public bool TimingChange;
public bool KiaiMode;
public bool OmitFirstBarLine;
public ControlPoint Clone() => (ControlPoint)MemberwiseClone();
}
}

View File

@ -29,7 +29,7 @@ namespace osu.Game.Beatmaps.Timing
ControlPoint overridePoint;
ControlPoint timingPoint = TimingPointAt(time, out overridePoint);
return overridePoint?.VelocityAdjustment ?? timingPoint?.VelocityAdjustment ?? 1;
return overridePoint?.SpeedMultiplier ?? timingPoint?.SpeedMultiplier ?? 1;
}
/// <summary>