h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 01:30:05 +08:00
Code Issues Releases Wiki Activity

Simplify beatmap access in carousel panels

Browse Source
This commit is contained in:
Bartłomiej Dach
2025-09-03 09:52:37 +02:00
Unverified
parent 566562240e
commit 315eea8d9a
2 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/SelectV2/PanelBeatmap.cs
+2 -16
View File
@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@@ -72,14 +71,7 @@ namespace osu.Game.Screens.SelectV2
[Resolved]
private ISongSelect? songSelect { get; set; }
private GroupedBeatmap groupedBeatmap
{
get
{
Debug.Assert(Item != null);
return (GroupedBeatmap)Item!.Model;
}
}
private BeatmapInfo beatmap => ((GroupedBeatmap)Item!.Model).Beatmap;
public PanelBeatmap()
{
@@ -216,8 +208,6 @@ namespace osu.Game.Screens.SelectV2
{
base.PrepareForUse();
var beatmap = groupedBeatmap.Beatmap;
difficultyIcon.Icon = getRulesetIcon(beatmap.Ruleset);
localRank.Beatmap = beatmap;
@@ -256,8 +246,6 @@ namespace osu.Game.Screens.SelectV2
if (Item == null)
return;
var beatmap = groupedBeatmap.Beatmap;
starDifficultyBindable = difficultyCache.GetBindableDifficulty(beatmap, starDifficultyCancellationSource.Token, SongSelect.SELECTION_DEBOUNCE);
starDifficultyBindable.BindValueChanged(starDifficulty =>
{
@@ -301,8 +289,6 @@ namespace osu.Game.Screens.SelectV2
if (Item == null)
return;
var beatmap = groupedBeatmap.Beatmap;
if (ruleset.Value.OnlineID == 3)
{
// Account for mania differences locally for now.
@@ -327,7 +313,7 @@ namespace osu.Game.Screens.SelectV2
List<MenuItem> items = new List<MenuItem>();
if (songSelect != null)
items.AddRange(songSelect.GetForwardActions(groupedBeatmap.Beatmap));
items.AddRange(songSelect.GetForwardActions(beatmap));
return items.ToArray();
}
osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs
+2 -15
View File
@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@@ -73,14 +72,7 @@ namespace osu.Game.Screens.SelectV2
private Box backgroundBorder = null!;
private GroupedBeatmap groupedBeatmap
{
get
{
Debug.Assert(Item != null);
return (GroupedBeatmap)Item!.Model;
}
}
private BeatmapInfo beatmap => ((GroupedBeatmap)Item!.Model).Beatmap;
public PanelBeatmapStandalone()
{
@@ -228,7 +220,6 @@ namespace osu.Game.Screens.SelectV2
{
base.PrepareForUse();
var beatmap = groupedBeatmap.Beatmap;
var beatmapSet = beatmap.BeatmapSet!;
beatmapBackground.Beatmap = beatmaps.GetWorkingBeatmap(beatmap);
@@ -269,8 +260,6 @@ namespace osu.Game.Screens.SelectV2
if (Item == null)
return;
var beatmap = groupedBeatmap.Beatmap;
starDifficultyBindable = difficultyCache.GetBindableDifficulty(beatmap, starDifficultyCancellationSource.Token, SongSelect.SELECTION_DEBOUNCE);
starDifficultyBindable.BindValueChanged(starDifficulty =>
{
@@ -307,8 +296,6 @@ namespace osu.Game.Screens.SelectV2
if (Item == null)
return;
var beatmap = groupedBeatmap.Beatmap;
if (ruleset.Value.OnlineID == 3)
{
// Account for mania differences locally for now.
@@ -333,7 +320,7 @@ namespace osu.Game.Screens.SelectV2
List<MenuItem> items = new List<MenuItem>();
if (songSelect != null)
items.AddRange(songSelect.GetForwardActions(groupedBeatmap.Beatmap));
items.AddRange(songSelect.GetForwardActions(beatmap));
return items.ToArray();
}