RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow TimingControlPoint to be overridden

This commit is contained in:
smoogipoo 2018-10-09 11:34:38 +09:00
parent f8eaccddda
commit b7499fa956
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
View File

@ -16,7 +16,7 @@ public class TimingControlPoint : ControlPoint
/// <summary>
/// The beat length at this control point.
/// </summary>
public double BeatLength
public virtual double BeatLength
{
get => beatLength;
set => beatLength = MathHelper.Clamp(value, 6, 60000);

14
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -318,12 +318,12 @@ private void handleTimingPoint(string line)
if (timingChange)
{
handleTimingControlPoint(new TimingControlPoint
{
Time = time,
BeatLength = beatLength,
TimeSignature = timeSignature
});
var controlPoint = CreateTimingControlPoint();
controlPoint.Time = time;
controlPoint.BeatLength = beatLength;
controlPoint.TimeSignature = timeSignature;
handleTimingControlPoint(controlPoint);
}
handleDifficultyControlPoint(new DifficultyControlPoint
@ -418,6 +418,8 @@ private void handleHitObject(string line)
private double getOffsetTime(double time) => time + (ApplyOffsets ? offset : 0);
protected virtual TimingControlPoint CreateTimingControlPoint() => new TimingControlPoint();
[Flags]
internal enum EffectFlags
{