h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 19:03:08 +08:00
Code Issues Releases Wiki Activity

Avoid relying on game-wide ruleset bindable

Browse Source
This commit is contained in:
Salman Ahmed 2024-02-23 16:47:37 +03:00
parent ae9c58be30
commit f94cd4483c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/OnlinePlay/Match/RoomModSelectOverlay.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -25,7 +26,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
private IBindable<PlaylistItem>? selectedItem { get; set; } private IBindable<PlaylistItem>? selectedItem { get; set; }
[Resolved] [Resolved]
private OsuGameBase game { get; set; } = null!; private RulesetStore rulesets { get; set; } = null!;
protected override BeatmapAttributesDisplay GetBeatmapAttributesDisplay => new RoomBeatmapAttributesDisplay protected override BeatmapAttributesDisplay GetBeatmapAttributesDisplay => new RoomBeatmapAttributesDisplay
{ {
@ -48,9 +49,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
if (selectedItem?.Value != null) if (selectedItem?.Value != null)
{ {
Ruleset ruleset = game.Ruleset.Value.CreateInstance(); var rulesetInstance = rulesets.GetRuleset(selectedItem.Value.RulesetID)?.CreateInstance();
var multiplayerRoomMods = selectedItem.Value.RequiredMods.Select(m => m.ToMod(ruleset)); Debug.Assert(rulesetInstance != null);
allMods = allMods.Concat(multiplayerRoomMods); allMods = allMods.Concat(selectedItem.Value.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
} }
return allMods; return allMods;
@ -61,12 +62,15 @@ namespace osu.Game.Screens.OnlinePlay.Match
public partial class RoomBeatmapAttributesDisplay : BeatmapAttributesDisplay public partial class RoomBeatmapAttributesDisplay : BeatmapAttributesDisplay
{ {
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private IBindable<PlaylistItem>? multiplayerRoomItem { get; set; } private IBindable<PlaylistItem>? selectedItem { get; set; }
[Resolved]
private RulesetStore rulesets { get; set; } = null!;
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
multiplayerRoomItem?.BindValueChanged(_ => Mods.TriggerChange()); selectedItem?.BindValueChanged(_ => Mods.TriggerChange());
} }
protected override IEnumerable<Mod> SelectedMods protected override IEnumerable<Mod> SelectedMods
@ -75,11 +79,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
{ {
IEnumerable<Mod> selectedMods = Mods.Value; IEnumerable<Mod> selectedMods = Mods.Value;
if (multiplayerRoomItem?.Value != null) if (selectedItem?.Value != null)
{ {
Ruleset ruleset = GameRuleset.Value.CreateInstance(); var rulesetInstance = rulesets.GetRuleset(selectedItem.Value.RulesetID)?.CreateInstance();
var multiplayerRoomMods = multiplayerRoomItem.Value.RequiredMods.Select(m => m.ToMod(ruleset)); Debug.Assert(rulesetInstance != null);
selectedMods = selectedMods.Concat(multiplayerRoomMods); selectedMods = selectedMods.Concat(selectedItem.Value.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
} }
return selectedMods; return selectedMods;