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

General code cleanup

Browse Source
This commit is contained in:
Salman Ahmed 2024-02-23 17:30:31 +03:00
parent 9ce07a96b2
commit fdc0636554
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -274,12 +274,12 @@ namespace osu.Game.Overlays.Mods
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight
},
beatmapAttributesDisplay = CreateBeatmapAttributesDisplay().With(b =>
beatmapAttributesDisplay = new BeatmapAttributesDisplay
{
b.Anchor = Anchor.BottomRight;
b.Origin = Anchor.BottomRight;
b.BeatmapInfo.Value = Beatmap?.BeatmapInfo;
}),
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
BeatmapInfo = { Value = Beatmap?.BeatmapInfo },
},
}
});
}
@ -289,8 +289,6 @@ namespace osu.Game.Overlays.Mods
textSearchStartsActive = configManager.GetBindable<bool>(OsuSetting.ModSelectTextSearchStartsActive);
}
protected virtual BeatmapAttributesDisplay CreateBeatmapAttributesDisplay() => new BeatmapAttributesDisplay();
public override void Hide()
{
base.Hide();

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

@ -16,32 +16,32 @@ namespace osu.Game.Screens.OnlinePlay.Match
{
public partial class RoomModSelectOverlay : UserModSelectOverlay
{
public RoomModSelectOverlay(OverlayColourScheme colourScheme = OverlayColourScheme.Plum)
: base(colourScheme)
{
}
[Resolved(CanBeNull = true)]
private IBindable<PlaylistItem>? selectedItem { get; set; }
[Resolved]
private IBindable<PlaylistItem> selectedItem { get; set; } = null!;
[Resolved]
private RulesetStore rulesets { get; set; } = null!;
private readonly List<Mod> roomMods = new List<Mod>();
public RoomModSelectOverlay()
: base(OverlayColourScheme.Plum)
{
}
protected override void LoadComplete()
{
base.LoadComplete();
selectedItem?.BindValueChanged(_ =>
selectedItem.BindValueChanged(_ =>
{
roomMods.Clear();
if (selectedItem?.Value != null)
if (selectedItem.Value is PlaylistItem item)
{
var rulesetInstance = rulesets.GetRuleset(selectedItem.Value.RulesetID)?.CreateInstance();
var rulesetInstance = rulesets.GetRuleset(item.RulesetID)?.CreateInstance();
Debug.Assert(rulesetInstance != null);
roomMods.AddRange(selectedItem.Value.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
roomMods.AddRange(item.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
}
SelectedMods.TriggerChange();