sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 02:37:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22133 from peppy/fix-fail-sound-not-playing

Browse Source 
Fix skin fail sound not correctly playing
This commit is contained in:
Bartłomiej Dach 2023-01-11 17:28:03 +01:00 committed by GitHub
commit 8e022ad4f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Play/FailAnimation.cs
View File

@ -15,11 +15,13 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Audio;
using osu.Game.Audio.Effects; using osu.Game.Audio.Effects;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Skinning;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -48,7 +50,7 @@ namespace osu.Game.Screens.Play
private const float duration = 2500; private const float duration = 2500;
private Sample? failSample; private ISample? failSample;
[Resolved] [Resolved]
private OsuConfigManager config { get; set; } = null!; private OsuConfigManager config { get; set; } = null!;
@ -73,10 +75,10 @@ namespace osu.Game.Screens.Play
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, IBindable<WorkingBeatmap> beatmap) private void load(AudioManager audio, ISkinSource skin, IBindable<WorkingBeatmap> beatmap)
{ {
track = beatmap.Value.Track; track = beatmap.Value.Track;
failSample = audio.Samples.Get(@"Gameplay/failsound"); failSample = skin.GetSample(new SampleInfo(@"Gameplay/failsound"));
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {