h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-04 00:14:12 +08:00
Code Issues Releases Wiki Activity

Remove BeatmapSelectGrid.RevealRandomItem method

Browse Source
This commit is contained in:
marvin
2025-11-18 19:33:59 +01:00
Unverified
parent fe56ba2921
commit 277f4268db
3 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs
-2
View File
@@ -8,7 +8,6 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@@ -194,7 +193,6 @@ namespace osu.Game.Tests.Visual.Matchmaking
Scheduler.AddDelayed(() =>
{
grid.PresentRolledBeatmap(finalItem, MatchmakingCandidateType.Random);
grid.RevealRandomItem(items[RNG.Next(items.Length)].PlaylistItem);
}, 500);
});
}
osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
-10
View File
@@ -141,16 +141,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
panel.RemoveUser(user);
});
public void RevealRandomItem(MultiplayerPlaylistItem item) => whenPanelsLoaded(() =>
{
playlistItems.TryGetValue(item.ID, out var playlistItem);
Debug.Assert(playlistItem != null);
// TODO: make this happen via panel.PresentAsChosenBeatmap
// randomPanel.RevealBeatmap(playlistItem.Beatmap, playlistItem.Mods);
});
public void RollAndDisplayFinalBeatmap(long[] candidateItemIds, long finalItemId, MatchmakingCandidateType candidateType) => whenPanelsLoaded(() =>
{
Debug.Assert(candidateItemIds.Length >= 1);
osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/SubScreenBeatmapSelect.cs
-16
View File
@@ -79,7 +79,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
beatmapSelectGrid.ItemSelected += item => client.MatchmakingToggleSelection(item.ID);
client.MatchmakingItemSelected += onItemSelected;
client.MatchmakingItemDeselected += onItemDeselected;
client.SettingsChanged += onSettingsChanged;
Debug.Assert(client.Room != null);
@@ -136,20 +135,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
beatmapSelectGrid.SetUserSelection(user, itemId, false);
}
private void onSettingsChanged(MultiplayerRoomSettings settings)
{
if (client.Room!.MatchState is not MatchmakingRoomState matchmakingState)
return;
if (matchmakingState.Stage != MatchmakingStage.ServerBeatmapFinalised)
return;
if (matchmakingState.CandidateItem != -1)
return;
beatmapSelectGrid.RevealRandomItem(client.Room!.CurrentPlaylistItem);
}
public void RollFinalBeatmap(long[] candidateItems, long finalItem, MatchmakingCandidateType panelType) =>
beatmapSelectGrid.RollAndDisplayFinalBeatmap(candidateItems, finalItem, panelType);
@@ -161,7 +146,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
{
client.MatchmakingItemSelected -= onItemSelected;
client.MatchmakingItemDeselected -= onItemDeselected;
client.SettingsChanged -= onSettingsChanged;
}
}
}