From 87f3184fccee86fe7d3dc94c5ce38d98108ae8a6 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Wed, 21 Aug 2019 15:14:33 +0300
Subject: [PATCH] Try retrieving samples without bank names

Fallback for spinner bonus samples
---
 osu.Game/Skinning/SkinnableSound.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 8e2b5cec98..b50cc19482 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -55,8 +55,16 @@ private SampleChannel loadChannel(ISampleInfo info, Func<string, SampleChannel>
             foreach (var lookup in info.LookupNames)
             {
                 var ch = getSampleFunction($"Gameplay/{lookup}");
+
                 if (ch == null)
-                    continue;
+                {
+                    // Try fallback to non-bank samples.
+                    var bank = lookup.Split('/').Last().Split('-')[0] + '-';
+                    ch = getSampleFunction($"Gameplay/{lookup.Replace(bank, "")}");
+
+                    if (ch == null)
+                        continue;
+                }
 
                 ch.Volume.Value = info.Volume / 100.0;
                 return ch;