mirror of
https://github.com/ppy/osu
synced 2024-12-16 11:56:31 +00:00
Revert not decoding legacy difficulty points on scrolling rulesets for now
This commit is contained in:
parent
76ccdd1340
commit
80197bae48
@ -376,17 +376,12 @@ namespace osu.Game.Beatmaps.Formats
|
|||||||
addControlPoint(time, controlPoint, true);
|
addControlPoint(time, controlPoint, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isOsuRuleset = beatmap.BeatmapInfo.RulesetID == 0;
|
|
||||||
|
|
||||||
if (isOsuRuleset)
|
|
||||||
{
|
|
||||||
#pragma warning disable 618
|
#pragma warning disable 618
|
||||||
addControlPoint(time, new LegacyDifficultyControlPoint(beatLength)
|
addControlPoint(time, new LegacyDifficultyControlPoint(beatLength)
|
||||||
#pragma warning restore 618
|
#pragma warning restore 618
|
||||||
{
|
{
|
||||||
SliderVelocity = speedMultiplier,
|
SliderVelocity = speedMultiplier,
|
||||||
}, timingChange);
|
}, timingChange);
|
||||||
}
|
|
||||||
|
|
||||||
var effectPoint = new EffectControlPoint
|
var effectPoint = new EffectControlPoint
|
||||||
{
|
{
|
||||||
@ -394,6 +389,7 @@ namespace osu.Game.Beatmaps.Formats
|
|||||||
OmitFirstBarLine = omitFirstBarSignature,
|
OmitFirstBarLine = omitFirstBarSignature,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
bool isOsuRuleset = beatmap.BeatmapInfo.RulesetID == 0;
|
||||||
// scrolling rulesets use effect points rather than difficulty points for scroll speed adjustments.
|
// scrolling rulesets use effect points rather than difficulty points for scroll speed adjustments.
|
||||||
if (!isOsuRuleset)
|
if (!isOsuRuleset)
|
||||||
effectPoint.ScrollSpeed = speedMultiplier;
|
effectPoint.ScrollSpeed = speedMultiplier;
|
||||||
|
Loading…
Reference in New Issue
Block a user