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

private + renaming

Browse Source
This commit is contained in:
Jamie Taylor 2019-02-28 17:02:45 +09:00
parent 6e821a426d
commit 4c8aa65200
No known key found for this signature in database
GPG Key ID: 2ACFA8B6370B8C8C
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Multi.Play
private IBindable<RulesetInfo> ruleset { get; set; }
[Resolved]
protected Bindable<IEnumerable<Mod>> CurrentMods { get; private set; }
private Bindable<IEnumerable<Mod>> currentMods { get; set; }
public TimeshiftPlayer(PlaylistItem playlistItem)
{
@ -61,7 +61,7 @@ namespace osu.Game.Screens.Multi.Play
if (ruleset.Value.ID != playlistItem.Ruleset.ID)
throw new InvalidOperationException("Current Ruleset does not match PlaylistItem's Ruleset");
if (!playlistItem.RequiredMods.All(m => CurrentMods.Value.Contains(m)))
if (!playlistItem.RequiredMods.All(m => currentMods.Value.Contains(m)))
throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItem.ID);

4
osu.Game/Screens/Select/MatchSongSelect.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Select
protected Bindable<PlaylistItem> CurrentItem { get; private set; }
[Resolved]
protected Bindable<IEnumerable<Mod>> CurrentMods { get; private set; }
private Bindable<IEnumerable<Mod>> selectedMods { get; set; }
[Resolved]
private BeatmapManager beatmaps { get; set; }
@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select
return true;
Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value?.Beatmap);
Beatmap.Value.Mods.Value = CurrentMods.Value = CurrentItem.Value?.RequiredMods;
Beatmap.Value.Mods.Value = selectedMods.Value = CurrentItem.Value?.RequiredMods;
Ruleset.Value = CurrentItem.Value?.Ruleset;
Beatmap.Disabled = true;