From 0ea10a49223ab178cd4fb520ffd7fc2ad87c1464 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Aug 2019 17:18:32 +0900
Subject: [PATCH] Fix skin sample reading failing

---
 osu.Game/Skinning/LegacySkin.cs | 55 +++++++++++++++++----------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7bffe5d321..37a3059160 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -155,16 +155,40 @@ namespace osu.Game.Skinning
                             // Spacing value was reverse-engineered from the ratio of the rendered sprite size in the visual inspector vs the actual texture size
                             Spacing = new Vector2(-Configuration.HitCircleOverlap * 0.89f, 0)
                         };
-
-                default:
-                    string lastPiece = componentName.Split('/').Last();
-                    componentName = componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
-                    break;
             }
 
             return getAnimation(componentName, animatable, looping);
         }
 
+        public override Texture GetTexture(string componentName)
+        {
+            componentName = getFallbackName(componentName);
+
+            float ratio = 2;
+            var texture = Textures.Get($"{componentName}@2x");
+
+            if (texture == null)
+            {
+                ratio = 1;
+                texture = Textures.Get(componentName);
+            }
+
+            if (texture != null)
+                texture.ScaleAdjust = ratio;
+
+            return texture;
+        }
+
+        public override SampleChannel GetSample(string sampleName) => Samples.Get(getFallbackName(sampleName));
+
+        private bool hasFont(string fontName) => GetTexture($"{fontName}-0") != null;
+
+        private string getFallbackName(string componentName)
+        {
+            string lastPiece = componentName.Split('/').Last();
+            return componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
+        }
+
         private Drawable getAnimation(string componentName, bool animatable, bool looping, string animationSeparator = "-")
         {
             Texture texture;
@@ -200,27 +224,6 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Texture GetTexture(string componentName)
-        {
-            float ratio = 2;
-            var texture = Textures.Get($"{componentName}@2x");
-
-            if (texture == null)
-            {
-                ratio = 1;
-                texture = Textures.Get(componentName);
-            }
-
-            if (texture != null)
-                texture.ScaleAdjust = ratio;
-
-            return texture;
-        }
-
-        public override SampleChannel GetSample(string sampleName) => Samples.Get(sampleName);
-
-        private bool hasFont(string fontName) => GetTexture($"{fontName}-0") != null;
-
         protected class LegacySkinResourceStore<T> : IResourceStore<byte[]>
             where T : INamedFileInfo
         {