From 80197bae48f3deefae5934c680d51191e58d6045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Sat, 18 Sep 2021 15:32:08 +0200 Subject: [PATCH] Revert not decoding legacy difficulty points on scrolling rulesets for now --- osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs index 68e6a8ac00..94aea17e9d 100644 --- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs +++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs @@ -376,17 +376,12 @@ namespace osu.Game.Beatmaps.Formats addControlPoint(time, controlPoint, true); } - bool isOsuRuleset = beatmap.BeatmapInfo.RulesetID == 0; - - if (isOsuRuleset) - { #pragma warning disable 618 - addControlPoint(time, new LegacyDifficultyControlPoint(beatLength) + addControlPoint(time, new LegacyDifficultyControlPoint(beatLength) #pragma warning restore 618 - { - SliderVelocity = speedMultiplier, - }, timingChange); - } + { + SliderVelocity = speedMultiplier, + }, timingChange); var effectPoint = new EffectControlPoint { @@ -394,6 +389,7 @@ namespace osu.Game.Beatmaps.Formats OmitFirstBarLine = omitFirstBarSignature, }; + bool isOsuRuleset = beatmap.BeatmapInfo.RulesetID == 0; // scrolling rulesets use effect points rather than difficulty points for scroll speed adjustments. if (!isOsuRuleset) effectPoint.ScrollSpeed = speedMultiplier;