RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Loop over lookup names on default-samples retrieval

This commit is contained in:
iiSaLMaN 2019-08-27 19:42:17 +03:00
parent 66223b9954
commit 4ef991b973
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Skinning/SkinnableSound.cs
View File

@ -45,10 +45,9 @@ protected override void SkinChanged(ISkinSource skin, bool allowFallback)
var ch = skin.GetSample(s); var ch = skin.GetSample(s);
if (ch == null && allowFallback) if (ch == null && allowFallback)
if (s is HitSampleInfo hsi) foreach (var lookup in s.LookupNames)
ch = audio.Samples.Get(string.IsNullOrEmpty(hsi.Namespace) if ((ch = audio.Samples.Get($"Gameplay/{lookup}")) != null)
? $"Gameplay/{hsi.Namespace}/{hsi.Bank}-{hsi.Name}" break;
: $"Gameplay/{hsi.Bank}-{hsi.Name}");
if (ch != null) if (ch != null)
ch.Volume.Value = s.Volume / 100.0; ch.Volume.Value = s.Volume / 100.0;