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

One missing carousel rename.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-23 13:28:49 +09:00
parent 60d939f323
commit 622b127180
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select
private BeatmapDatabase database; private BeatmapDatabase database;
protected override BackgroundMode CreateBackground() => new BackgroundModeBeatmap(Beatmap); protected override BackgroundMode CreateBackground() => new BackgroundModeBeatmap(Beatmap);
private CarouselContainer carousell; private CarouselContainer carousel;
private TrackManager trackManager; private TrackManager trackManager;
private Container backgroundWedgesContainer; private Container backgroundWedgesContainer;
@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select
}, },
} }
}, },
carousell = new CarouselContainer carousel = new CarouselContainer
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Size = new Vector2(scrollWidth, 1), Size = new Vector2(scrollWidth, 1),
@ -131,7 +131,7 @@ namespace osu.Game.Screens.Select
Colour = new Color4(238, 51, 153, 255), Colour = new Color4(238, 51, 153, 255),
Action = () => Push(new Player Action = () => Push(new Player
{ {
BeatmapInfo = carousell.SelectedGroup.SelectedPanel.Beatmap, BeatmapInfo = carousel.SelectedGroup.SelectedPanel.Beatmap,
PreferredPlayMode = playMode.Value PreferredPlayMode = playMode.Value
}) })
}, },
@ -243,7 +243,7 @@ namespace osu.Game.Screens.Select
private void selectBeatmap(BeatmapInfo beatmap) private void selectBeatmap(BeatmapInfo beatmap)
{ {
carousell.SelectBeatmap(beatmap); carousel.SelectBeatmap(beatmap);
} }
/// <summary> /// <summary>
@ -287,15 +287,15 @@ namespace osu.Game.Screens.Select
//this likely won't scale so well, but allows us to completely async the loading flow. //this likely won't scale so well, but allows us to completely async the loading flow.
Task.WhenAll(group.BeatmapPanels.Select(panel => panel.Preload(game))).ContinueWith(task => Schedule(delegate Task.WhenAll(group.BeatmapPanels.Select(panel => panel.Preload(game))).ContinueWith(task => Schedule(delegate
{ {
carousell.AddGroup(group); carousel.AddGroup(group);
if (Beatmap == null) if (Beatmap == null)
carousell.SelectBeatmap(beatmapSet.Beatmaps.First()); carousel.SelectBeatmap(beatmapSet.Beatmaps.First());
else else
{ {
var panel = group.BeatmapPanels.FirstOrDefault(p => p.Beatmap.Equals(Beatmap.BeatmapInfo)); var panel = group.BeatmapPanels.FirstOrDefault(p => p.Beatmap.Equals(Beatmap.BeatmapInfo));
if (panel != null) if (panel != null)
carousell.SelectGroup(group, panel); carousel.SelectGroup(group, panel);
} }
})); }));
} }