sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename SelectedMods -> Mods

Browse Source
This commit is contained in:
smoogipoo
2019-04-10 12:03:57 +09:00
parent 1c952e58cc
commit 4310f07a5c
26 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Multi/Match/MatchSubScreen.cs
View File

@ -179,7 +179,7 @@ namespace osu.Game.Screens.Multi.Match
{
RoomManager?.PartRoom();
SelectedMods.Value = Enumerable.Empty<Mod>();
Mods.Value = Enumerable.Empty<Mod>();
return base.OnExiting(next);
}
@ -193,7 +193,7 @@ namespace osu.Game.Screens.Multi.Match
var localBeatmap = e.NewValue?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == e.NewValue.Beatmap.OnlineBeatmapID);
Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
SelectedMods.Value = e.NewValue?.RequiredMods ?? Enumerable.Empty<Mod>();
Mods.Value = e.NewValue?.RequiredMods ?? Enumerable.Empty<Mod>();
if (e.NewValue?.Ruleset != null)
Ruleset.Value = e.NewValue.Ruleset;
}

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

@ -56,7 +56,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 => SelectedMods.Value.Contains(m)))
if (!playlistItem.RequiredMods.All(m => Mods.Value.Contains(m)))
throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItem.ID);