Merge e920cfa187 into ce8e4120b7

Move rate-changing TODO to a common place in CalculateRateWithMods
2024-12-05 09:42:54 +08:00 · 2024-12-02 14:50:14 -08:00 · 2024-12-02 23:49:51 +01:00
3 changed files with 1 additions and 2 deletions
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
@ -88,7 +88,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists

        private bool enoughTimeLeft()
        {
-            // TODO: This doesn't consider mods which apply variable rates, yet.
            double rate = ModUtils.CalculateRateWithMods(mods.Value);

            // We want to avoid users not being able to submit scores if they chose to not skip,
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@ -401,7 +401,6 @@ namespace osu.Game.Screens.Select
                if (beatmap == null || bpmLabelContainer == null)
                    return;

-                // this doesn't consider mods which apply variable rates, yet.
                double rate = ModUtils.CalculateRateWithMods(mods.Value);

                int bpmMax = FormatUtils.RoundBPM(beatmap.ControlPointInfo.BPMMaximum, rate);
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@ -286,6 +286,7 @@ namespace osu.Game.Utils
        {
            double rate = 1;

+            // TODO: This doesn't consider mods which apply variable rates, yet.
            foreach (var mod in mods.OfType<IApplicableToRate>())
                rate = mod.ApplyToRate(0, rate);
Author	SHA1	Message	Date
Tim Schumacher	1325a51d9f	Merge `e920cfa187` into `ce8e4120b7`	2024-12-02 14:50:14 -08:00
Tim Schumacher	e920cfa187	Move rate-changing TODO to a common place in CalculateRateWithMods	2024-12-02 23:49:51 +01:00