From 318fe2f9d6af04ce1444a6fc64b5a25d0f52ebc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 20 Nov 2016 20:43:43 +0100 Subject: [PATCH] Fix broken VisualTests SongSelect. --- osu.Game/Screens/Select/PlaySongSelect.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index f259b28bcf..d5b66d5bd7 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -23,6 +23,7 @@ using OpenTK; 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 @@ namespace osu.Game.Screens.Select } [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 @@ namespace osu.Game.Screens.Select }); } - private void addBeatmapSet(BeatmapSetInfo beatmapSet, OsuGame game) + private void addBeatmapSet(BeatmapSetInfo beatmapSet, BaseGame game) { beatmapSet = database.GetWithChildren(beatmapSet.BeatmapSetID); beatmapSet.Beatmaps.ForEach(b => database.GetChildren(b)); @@ -395,7 +396,7 @@ namespace osu.Game.Screens.Select })); } - private void addBeatmapSets(OsuGame game) + private void addBeatmapSets(BaseGame game) { foreach (var beatmapSet in database.Query()) addBeatmapSet(beatmapSet, game);