From f48984920d5b489adba4afd4a8c3c9fedaceebe1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Jul 2020 11:21:32 +0900
Subject: [PATCH] Change bonus volume logic to work

---
 .../Objects/Drawables/DrawableSpinnerTick.cs       | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 6512a9526e..436994e480 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
@@ -10,8 +8,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSpinnerTick : DrawableOsuHitObject
     {
-        private readonly BindableDouble bonusSampleVolume = new BindableDouble();
-
         private bool hasBonusPoints;
 
         /// <summary>
@@ -25,8 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 hasBonusPoints = value;
 
-                bonusSampleVolume.Value = value ? 1 : 0;
-                ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints = value;
+                Samples.Volume.Value = ((OsuSpinnerTickJudgement)Result.Judgement).HasBonusPoints ? 1 : 0;
             }
         }
 
@@ -37,13 +32,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Samples.AddAdjustment(AdjustableProperty.Volume, bonusSampleVolume);
-        }
-
         /// <summary>
         /// Apply a judgement result.
         /// </summary>