From 18aa168a00f1bdfb019844e5e024a3b0d606dac3 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 7 Mar 2025 15:45:27 +0900
Subject: [PATCH] Allow kiai/star-fountain SFX to be skinnable

---
 osu.Game/Screens/Menu/KiaiMenuFountains.cs     | 12 ++++++++----
 osu.Game/Screens/Play/KiaiGameplayFountains.cs | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/KiaiMenuFountains.cs b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
index dbbff4a9f5..b103d9e573 100644
--- a/osu.Game/Screens/Menu/KiaiMenuFountains.cs
+++ b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
@@ -3,11 +3,12 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Graphics.Containers;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Menu
 {
@@ -16,11 +17,14 @@ namespace osu.Game.Screens.Menu
         private StarFountain leftFountain = null!;
         private StarFountain rightFountain = null!;
 
-        private Sample? sample;
+        [Resolved]
+        private ISkinSource skin { get; set; } = null!;
+
+        private ISample? sample;
         private SampleChannel? sampleChannel;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load()
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -40,7 +44,7 @@ namespace osu.Game.Screens.Menu
                 },
             };
 
-            sample = audio.Samples.Get(@"Gameplay/fountain-shoot");
+            sample = skin.GetSample(new SampleInfo(@"Gameplay/fountain-shoot"));
         }
 
         private bool isTriggered;
diff --git a/osu.Game/Screens/Play/KiaiGameplayFountains.cs b/osu.Game/Screens/Play/KiaiGameplayFountains.cs
index 7e09f50133..c8dcee2580 100644
--- a/osu.Game/Screens/Play/KiaiGameplayFountains.cs
+++ b/osu.Game/Screens/Play/KiaiGameplayFountains.cs
@@ -3,14 +3,15 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Menu;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play
 {
@@ -21,11 +22,14 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> kiaiStarFountains = null!;
 
-        private Sample? sample;
+        [Resolved]
+        private ISkinSource skin { get; set; } = null!;
+
+        private ISample? sample;
         private SampleChannel? sampleChannel;
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, AudioManager audio)
+        private void load(OsuConfigManager config)
         {
             kiaiStarFountains = config.GetBindable<bool>(OsuSetting.StarFountains);
 
@@ -47,7 +51,7 @@ namespace osu.Game.Screens.Play
                 },
             };
 
-            sample = audio.Samples.Get(@"Gameplay/fountain-shoot");
+            sample = skin.GetSample(new SampleInfo(@"Gameplay/fountain-shoot"));
         }
 
         private bool isTriggered;