1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 09:37:23 +08:00

Merge remote-tracking branch 'jai-sharma/master' into better-caching

This commit is contained in:
Dean Herbert 2017-07-05 13:37:43 -07:00
commit ecfaac4eac

View File

@ -151,8 +151,8 @@ namespace osu.Game.Overlays.Mods
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
sampleOn = audio.Sample.Get(@"Checkbox/check-on"); sampleOn = audio.Sample.Get(@"UI/check-on");
sampleOff = audio.Sample.Get(@"Checkbox/check-off"); sampleOff = audio.Sample.Get(@"UI/check-off");
} }
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -171,7 +171,7 @@ namespace osu.Game.Overlays.Mods
public void SelectNext() public void SelectNext()
{ {
(++SelectedIndex == -1 ? sampleOff : sampleOn).Play(); (++SelectedIndex == Mods.Length ? sampleOff : sampleOn).Play();
Action?.Invoke(SelectedMod); Action?.Invoke(SelectedMod);
} }