h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 02:23:10 +08:00
Code Issues Releases Wiki Activity

CanChangeBeatmap -> CanBeatmapChange

Browse Source
This commit is contained in:
MrTheMake 2017-06-19 16:45:21 +02:00
parent 8bee06943b
commit 15a1dd14a6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Music/PlaylistOverlay.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Music
public IEnumerable<BeatmapSetInfo> BeatmapSets; public IEnumerable<BeatmapSetInfo> BeatmapSets;
private InputManager inputManager; private InputManager inputManager;
private bool canChangeBeatmap => currentScreenBacking.Value?.CanChangeBeatmap != false; private bool canBeatmapChange => currentScreenBacking.Value?.CanBeatmapChange != false;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGameBase game, BeatmapDatabase beatmaps, OsuColour colours, UserInputManager inputManager) 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) private void playSpecified(BeatmapInfo info)
{ {
if (!canChangeBeatmap) if (!canBeatmapChange)
return; return;
beatmapBacking.Value = beatmaps.GetWorkingBeatmap(info, beatmapBacking); beatmapBacking.Value = beatmaps.GetWorkingBeatmap(info, beatmapBacking);

2
osu.Game/Screens/OsuScreen.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens
internal virtual bool AllowRulesetChange => true; internal virtual bool AllowRulesetChange => true;
internal virtual bool CanChangeBeatmap => true; internal virtual bool CanBeatmapChange => true;
private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>(); private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();

2
osu.Game/Screens/Play/Player.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Play
internal override bool ShowOverlays => false; internal override bool ShowOverlays => false;
internal override bool CanChangeBeatmap => false; internal override bool CanBeatmapChange => false;
internal override bool HasLocalCursorDisplayed => !pauseContainer.IsPaused && !HasFailed && HitRenderer.ProvidingUserCursor; internal override bool HasLocalCursorDisplayed => !pauseContainer.IsPaused && !HasFailed && HitRenderer.ProvidingUserCursor;

2
osu.Game/Screens/Ranking/Results.cs
View File

@ -280,6 +280,6 @@ namespace osu.Game.Screens.Ranking
modeChangeButtons.Current.TriggerChange(); modeChangeButtons.Current.TriggerChange();
} }
internal override bool CanChangeBeatmap => false; internal override bool CanBeatmapChange => false;
} }
} }