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

Assign default control points earlier in `HitObject` construction

This commit is contained in:
Dean Herbert 2021-09-02 19:42:34 +09:00
parent 2b9157987e
commit 74f385bad8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -66,9 +66,9 @@ public IList<HitSampleInfo> Samples
}
}
public SampleControlPoint SampleControlPoint;
public SampleControlPoint SampleControlPoint = SampleControlPoint.DEFAULT;
public DifficultyControlPoint DifficultyControlPoint;
public DifficultyControlPoint DifficultyControlPoint = DifficultyControlPoint.DEFAULT;
/// <summary>
/// Whether this <see cref="HitObject"/> is in Kiai time.
@ -112,11 +112,6 @@ public void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty d
SampleControlPoint = legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency);
DifficultyControlPoint = legacyInfo.DifficultyPointAt(StartTime);
}
else
{
SampleControlPoint ??= SampleControlPoint.DEFAULT;
DifficultyControlPoint ??= DifficultyControlPoint.DEFAULT;
}
ApplyDefaultsToSelf(controlPointInfo, difficulty);