1
0
mirror of https://github.com/ppy/osu.git synced 2026-06-05 02:23:38 +08:00

Fixed test case

This commit is contained in:
MrTheMake
2017-06-19 14:52:36 +02:00
Unverified
parent 5450499415
commit 13df0e0b04
3 changed files with 5 additions and 4 deletions
-2
View File
@@ -298,8 +298,6 @@ namespace osu.Game
private Container overlayContent;
public readonly Bindable<OsuScreen> CurrentScreen = new Bindable<OsuScreen>();
private FrameworkConfigManager frameworkConfig;
private void screenChanged(Screen newScreen)
+3
View File
@@ -18,6 +18,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.Processing;
using osu.Game.Online.API;
using osu.Game.Screens;
using SQLite.Net;
using osu.Framework.Graphics.Performance;
@@ -45,6 +46,8 @@ namespace osu.Game
public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
public readonly Bindable<OsuScreen> CurrentScreen = new Bindable<OsuScreen>();
private Bindable<bool> fpsDisplayVisible;
protected AssemblyName AssemblyName => Assembly.GetEntryAssembly()?.GetName() ?? new AssemblyName { Version = new Version() };
+2 -2
View File
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private void load(OsuGame game, OsuColour colours, LocalisationEngine localisation)
private void load(OsuGameBase game, OsuColour colours, LocalisationEngine localisation)
{
this.localisation = localisation;
@@ -222,7 +222,7 @@ namespace osu.Game.Overlays
private void screenChanged(OsuScreen newScreen)
{
canChangeBeatmap = newScreen?.CanChangeBeatmap ?? false;
canChangeBeatmap = newScreen?.CanChangeBeatmap ?? true;
prevButton.Enabled = canChangeBeatmap;
playButton.Enabled = canChangeBeatmap;