From 15a1dd14a6f96e2a8b13947da7126402a7fae385 Mon Sep 17 00:00:00 2001 From: MrTheMake Date: Mon, 19 Jun 2017 16:45:21 +0200 Subject: [PATCH] CanChangeBeatmap -> CanBeatmapChange --- osu.Game/Overlays/Music/PlaylistOverlay.cs | 4 ++-- osu.Game/Screens/OsuScreen.cs | 2 +- osu.Game/Screens/Play/Player.cs | 2 +- osu.Game/Screens/Ranking/Results.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs index e524089602..afe866c0df 100644 --- a/osu.Game/Overlays/Music/PlaylistOverlay.cs +++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs @@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Music public IEnumerable BeatmapSets; private InputManager inputManager; - private bool canChangeBeatmap => currentScreenBacking.Value?.CanChangeBeatmap != false; + private bool canBeatmapChange => currentScreenBacking.Value?.CanBeatmapChange != false; [BackgroundDependencyLoader] private void load(OsuGameBase game, BeatmapDatabase beatmaps, OsuColour colours, UserInputManager inputManager) @@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Music private void playSpecified(BeatmapInfo info) { - if (!canChangeBeatmap) + if (!canBeatmapChange) return; beatmapBacking.Value = beatmaps.GetWorkingBeatmap(info, beatmapBacking); diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs index 855ddbbd2f..6fbabd675e 100644 --- a/osu.Game/Screens/OsuScreen.cs +++ b/osu.Game/Screens/OsuScreen.cs @@ -29,7 +29,7 @@ namespace osu.Game.Screens internal virtual bool AllowRulesetChange => true; - internal virtual bool CanChangeBeatmap => true; + internal virtual bool CanBeatmapChange => true; private readonly Bindable beatmap = new Bindable(); diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index f22133fa6a..47649372bf 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -32,7 +32,7 @@ namespace osu.Game.Screens.Play internal override bool ShowOverlays => false; - internal override bool CanChangeBeatmap => false; + internal override bool CanBeatmapChange => false; internal override bool HasLocalCursorDisplayed => !pauseContainer.IsPaused && !HasFailed && HitRenderer.ProvidingUserCursor; diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs index 36bfa67f86..8cd45e4b5d 100644 --- a/osu.Game/Screens/Ranking/Results.cs +++ b/osu.Game/Screens/Ranking/Results.cs @@ -280,6 +280,6 @@ namespace osu.Game.Screens.Ranking modeChangeButtons.Current.TriggerChange(); } - internal override bool CanChangeBeatmap => false; + internal override bool CanBeatmapChange => false; } }