h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-15 23:57:25 +08:00
Code Issues Releases Wiki Activity

Prefer namespace lookups first

Browse Source
This commit is contained in:
Dean Herbert 2018-07-10 15:23:47 +09:00 committed by GitHub
parent ba258b8a05
commit 14c3cc70b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Audio/SampleInfo.cs
View File

@ -46,16 +46,17 @@ namespace osu.Game.Audio
{ {
get get
{ {
if (!string.IsNullOrEmpty(Suffix)) if (!string.IsNullOrEmpty(Namespace))
{ {
if (!string.IsNullOrEmpty(Namespace)) if (!string.IsNullOrEmpty(Suffix))
yield return $"{Namespace}/{Bank}-{Name}{Suffix}"; yield return $"{Namespace}/{Bank}-{Name}{Suffix}";
yield return $"{Bank}-{Name}{Suffix}"; // Without namespace as a fallback even when we have a namespace yield return $"{Namespace}/{Bank}-{Name}";
} }
if (!string.IsNullOrEmpty(Namespace)) // check non-namespace as a fallback even when we have a namespace
yield return $"{Namespace}/{Bank}-{Name}"; if (!string.IsNullOrEmpty(Suffix))
yield return $"{Bank}-{Name}"; // Without namespace as a fallback even when we have a namespace yield return $"{Bank}-{Name}{Suffix}";
yield return $"{Bank}-{Name}";
} }
} }