h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 02:22:57 +08:00
Code Issues Releases Wiki Activity

Make random works with panels too

Browse Source
This commit is contained in:
EVAST9919 2017-06-15 06:37:20 +03:00
parent 5a1edaa93c
commit 5117baae66
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ namespace osu.Game.Screens.Select
private readonly List<Panel> panels = new List<Panel>(); private readonly List<Panel> panels = new List<Panel>();
private readonly Stack<BeatmapGroup> randomSelectedBeatmaps = new Stack<BeatmapGroup>(); private readonly Stack<KeyValuePair<BeatmapGroup, BeatmapPanel>> randomSelectedBeatmaps = new Stack<KeyValuePair<BeatmapGroup, BeatmapPanel>>();
private BeatmapGroup selectedGroup; private BeatmapGroup selectedGroup;
private BeatmapPanel selectedPanel; private BeatmapPanel selectedPanel;
@ -175,7 +175,7 @@ namespace osu.Game.Screens.Select
public void SelectNextRandom() public void SelectNextRandom()
{ {
randomSelectedBeatmaps.Push(selectedGroup); randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
var visibleGroups = getVisibleGroups(); var visibleGroups = getVisibleGroups();
if (!visibleGroups.Any()) if (!visibleGroups.Any())
@ -214,10 +214,11 @@ namespace osu.Game.Screens.Select
while (randomSelectedBeatmaps.Any()) while (randomSelectedBeatmaps.Any())
{ {
var group = randomSelectedBeatmaps.Pop(); var beatmapCoordinates = randomSelectedBeatmaps.Pop();
var group = beatmapCoordinates.Key;
if (visibleGroups.Contains(group)) if (visibleGroups.Contains(group))
{ {
selectGroup(group, group.SelectedPanel); selectGroup(group, beatmapCoordinates.Value);
break; break;
} }
} }