mirror of
https://github.com/osukey/osukey.git
synced 2025-05-17 03:27:21 +09:00
Fix result of merge conflict
This commit is contained in:
parent
93ffe3d7ad
commit
d5c88cca8c
@ -450,8 +450,6 @@ namespace osu.Game.Beatmaps.Formats
|
|||||||
OmitFirstBarLine = omitFirstBarSignature,
|
OmitFirstBarLine = omitFirstBarSignature,
|
||||||
};
|
};
|
||||||
|
|
||||||
int onlineRulesetID = beatmap.BeatmapInfo.Ruleset.OnlineID;
|
|
||||||
|
|
||||||
// osu!taiko and osu!mania use effect points rather than difficulty points for scroll speed adjustments.
|
// osu!taiko and osu!mania use effect points rather than difficulty points for scroll speed adjustments.
|
||||||
if (onlineRulesetID == 1 || onlineRulesetID == 3)
|
if (onlineRulesetID == 1 || onlineRulesetID == 3)
|
||||||
effectPoint.ScrollSpeed = speedMultiplier;
|
effectPoint.ScrollSpeed = speedMultiplier;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user