sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Applied suggested changes

Browse Source
This commit is contained in:
EVAST9919
2017-06-05 12:24:28 +03:00
parent 6b9d5afc4b
commit 78500eec21
5 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -171,7 +171,7 @@ namespace osu.Game.Screens.Select
} while (index != startIndex);
}
public void SelectRandom()
public void SelectNextRandom()
{
randomSelectedBeatmaps.Push(selectedGroup);
@ -201,7 +201,7 @@ namespace osu.Game.Screens.Select
selectGroup(group, panel);
}
public void CancelRandom()
public void SelectPreviousRandom()
{
if (!randomSelectedBeatmaps.Any())
return;
@ -210,19 +210,12 @@ namespace osu.Game.Screens.Select
if (!visibleGroups.Any())
return;
// we can avoid selecting deleted beatmaps or beatmaps selected in another gamemode
while (true)
while (randomSelectedBeatmaps.Any())
{
if (!randomSelectedBeatmaps.Any()) break;
if (!visibleGroups.Contains(randomSelectedBeatmaps.FirstOrDefault()))
var group = randomSelectedBeatmaps.Pop();
if (visibleGroups.Contains(group))
{
randomSelectedBeatmaps.Pop();
}
else
{
BeatmapGroup beatmapGroup = randomSelectedBeatmaps.Pop();
selectGroup(beatmapGroup, beatmapGroup.SelectedPanel);
selectGroup(group, group.SelectedPanel);
break;
}
}