diff --git a/osu.Android.props b/osu.Android.props
index 04c543750e..71525a7acb 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
-
+
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f17daa8697..3d5ed70dda 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -154,6 +154,7 @@ namespace osu.Game.Screens.Select
private readonly DrawablePool setPool = new DrawablePool(100);
private Sample spinSample;
+ private Sample randomSelectSample;
private int visibleSetsCount;
@@ -178,6 +179,7 @@ namespace osu.Game.Screens.Select
private void load(OsuConfigManager config, AudioManager audio)
{
spinSample = audio.Samples.Get("SongSelect/random-spin");
+ randomSelectSample = audio.Samples.Get(@"SongSelect/select-random");
config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
@@ -495,6 +497,8 @@ namespace osu.Game.Screens.Select
var chan = spinSample.GetChannel();
chan.Frequency.Value = 1f + Math.Min(1f, distance / visibleSetsCount);
chan.Play();
+
+ randomSelectSample?.Play();
}
private void select(CarouselItem item)
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ee807762bf..f5b11448f8 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -100,7 +100,6 @@ namespace osu.Game.Screens.Select
private Sample sampleChangeDifficulty;
private Sample sampleChangeBeatmap;
- private Sample sampleRandomBeatmap;
private Container carouselContainer;
@@ -110,8 +109,6 @@ namespace osu.Game.Screens.Select
private double audioFeedbackLastPlaybackTime;
- private bool randomSelectionPending;
-
[Resolved]
private MusicController music { get; set; }
@@ -291,7 +288,6 @@ namespace osu.Game.Screens.Select
sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
sampleChangeBeatmap = audio.Samples.Get(@"SongSelect/select-expand");
- sampleRandomBeatmap = audio.Samples.Get(@"SongSelect/select-random");
SampleConfirm = audio.Samples.Get(@"SongSelect/confirm-selection");
if (dialogOverlay != null)
@@ -319,16 +315,8 @@ namespace osu.Game.Screens.Select
(new FooterButtonMods { Current = Mods }, ModSelect),
(new FooterButtonRandom
{
- NextRandom = () =>
- {
- randomSelectionPending = true;
- Carousel.SelectNextRandom();
- },
- PreviousRandom = () =>
- {
- randomSelectionPending = true;
- Carousel.SelectPreviousRandom();
- }
+ NextRandom = () => Carousel.SelectNextRandom(),
+ PreviousRandom = Carousel.SelectPreviousRandom
}, null),
(new FooterButtonOptions(), BeatmapOptions)
};
@@ -498,9 +486,7 @@ namespace osu.Game.Screens.Select
{
if (beatmap != null && beatmapInfoPrevious != null && Time.Current - audioFeedbackLastPlaybackTime >= 50)
{
- if (randomSelectionPending)
- sampleRandomBeatmap.Play();
- else if (beatmap.BeatmapSet?.ID == beatmapInfoPrevious.BeatmapSet?.ID)
+ if (beatmap.BeatmapSet?.ID == beatmapInfoPrevious.BeatmapSet?.ID)
sampleChangeDifficulty.Play();
else
sampleChangeBeatmap.Play();
@@ -508,7 +494,6 @@ namespace osu.Game.Screens.Select
audioFeedbackLastPlaybackTime = Time.Current;
}
- randomSelectionPending = false;
beatmapInfoPrevious = beatmap;
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 83c3593edb..c8f634284b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index b0c056ea21..5978f6d685 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
-
+