h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:42:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1780 from peppy/fix-regression

Browse Source 
As it turns out, native directory separators are not supported
This commit is contained in:
Dan Balasescu 2017-12-28 01:59:44 +09:00 committed by GitHub
commit 08e15d63c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using System.IO;
using osu.Framework.Audio.Sample; using osu.Framework.Audio.Sample;
namespace osu.Game.Audio namespace osu.Game.Audio
@ -20,11 +19,11 @@ namespace osu.Game.Audio
SampleChannel channel = null; SampleChannel channel = null;
if (resourceNamespace != null) if (resourceNamespace != null)
channel = manager.Get(Path.Combine("Gameplay", resourceNamespace, $"{Bank}-{Name}")); channel = manager.Get($"Gameplay/{resourceNamespace}/{Bank}-{Name}");
// try without namespace as a fallback. // try without namespace as a fallback.
if (channel == null) if (channel == null)
channel = manager.Get(Path.Combine("Gameplay", $"{Bank}-{Name}")); channel = manager.Get($"Gameplay/{Bank}-{Name}");
if (channel != null) if (channel != null)
channel.Volume.Value = Volume / 100.0; channel.Volume.Value = Volume / 100.0;