Revert not decoding legacy difficulty points on scrolling rulesets for now

This commit is contained in:
Bartłomiej Dach 2021-09-18 15:32:08 +02:00
parent 76ccdd1340
commit 80197bae48
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497

View File

@ -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;