diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs index 46d77daeb7..a072d20637 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs @@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Toolbar base.LoadComplete(); globalVolume = audio.Volume.Scaled.GetBoundCopy(); - globalVolume.BindValueChanged(v => volumeBar.ResizeHeightTo((float)(1 - v.NewValue / VolumeScaler.MIN), 200, Easing.OutQuint), true); + globalVolume.BindValueChanged(v => volumeBar.ResizeHeightTo((float)(1 - (v.NewValue / VolumeScaler.MIN)), 200, Easing.OutQuint), true); } protected override bool OnKeyDown(KeyDownEvent e) diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs index 52d2979c32..30297d8da2 100644 --- a/osu.Game/Overlays/Volume/VolumeMeter.cs +++ b/osu.Game/Overlays/Volume/VolumeMeter.cs @@ -252,7 +252,7 @@ namespace osu.Game.Overlays.Volume get => displayVolume; set { - percentage = 1 - value / VolumeScaler.MIN; + percentage = 1 - (value / VolumeScaler.MIN); int step = (int)Math.Round(value / adjust_step); bool stepChanged = step != currentStep; @@ -288,7 +288,7 @@ namespace osu.Game.Overlays.Volume var channel = notchSample.GetChannel(); - channel.Frequency.Value = 0.99f + RNG.NextDouble(0.02f) + percentage * 0.1f; + channel.Frequency.Value = 0.99f + RNG.NextDouble(0.02f) + (percentage * 0.1f); // intentionally pitched down, even when hitting max. if (currentStep == step_min || currentStep == step_max)