RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken VisualTests SongSelect.

This commit is contained in:
Thomas Müller 2016-11-20 20:43:43 +01:00
parent c6d688898f
commit 318fe2f9d6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
using OpenTK.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Game.Screens.Play;
using osu.Framework;
namespace osu.Game.Screens.Select
{
@ -142,11 +143,11 @@ public PlaySongSelect(BeatmapDatabase database = null)
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapDatabase beatmaps, AudioManager audio, OsuGame game)
private void load(BeatmapDatabase beatmaps, AudioManager audio, BaseGame game, OsuGame osuGame)
{
if (game != null)
if (osuGame != null)
{
playMode = game.PlayMode;
playMode = osuGame.PlayMode;
playMode.ValueChanged += playMode_ValueChanged;
// Temporary:
carousell.Padding = new MarginPadding { Top = ToolbarPadding };
@ -368,7 +369,7 @@ private async Task ensurePlayingSelected()
});
}
private void addBeatmapSet(BeatmapSetInfo beatmapSet, OsuGame game)
private void addBeatmapSet(BeatmapSetInfo beatmapSet, BaseGame game)
{
beatmapSet = database.GetWithChildren<BeatmapSetInfo>(beatmapSet.BeatmapSetID);
beatmapSet.Beatmaps.ForEach(b => database.GetChildren(b));
@ -395,7 +396,7 @@ private void addBeatmapSet(BeatmapSetInfo beatmapSet, OsuGame game)
}));
}
private void addBeatmapSets(OsuGame game)
private void addBeatmapSets(BaseGame game)
{
foreach (var beatmapSet in database.Query<BeatmapSetInfo>())
addBeatmapSet(beatmapSet, game);