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

Fix merge issues

Browse Source
This commit is contained in:
OliBomby 2023-01-16 01:09:04 +01:00
parent ab6bf6e1dc
commit 832d033777
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -47,10 +47,10 @@ namespace osu.Game.Screens.Select.Carousel
private Sprite background = null!; private Sprite background = null!;
private MenuItem[] customMenuItems; private MenuItem[]? customMenuItems;
private Action<BeatmapInfo> selectRequested; private Action<BeatmapInfo>? selectRequested;
private Action<BeatmapInfo> hideRequested; private Action<BeatmapInfo>? hideRequested;
private Triangles triangles = null!; private Triangles triangles = null!;
@ -192,7 +192,7 @@ namespace osu.Game.Screens.Select.Carousel
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)
{ {
if (Item.State.Value == CarouselItemState.Selected) if (Item?.State.Value == CarouselItemState.Selected)
selectRequested?.Invoke(beatmapInfo); selectRequested?.Invoke(beatmapInfo);
return base.OnClick(e); return base.OnClick(e);

3
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Localisation; using osu.Game.Localisation;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Overlays.Notifications; using osu.Game.Overlays.Notifications;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
@ -39,7 +38,7 @@ namespace osu.Game.Screens.Select
new Func<BeatmapInfo, MenuItem>[] new Func<BeatmapInfo, MenuItem>[]
{ {
b => new OsuMenuItem("Play", MenuItemType.Highlighted, () => FinaliseSelection(b)), b => new OsuMenuItem("Play", MenuItemType.Highlighted, () => FinaliseSelection(b)),
b => new OsuMenuItem(CommonStrings.ButtonsEdit, MenuItemType.Standard, () => Edit(b)) b => new OsuMenuItem(Resources.Localisation.Web.CommonStrings.ButtonsEdit, MenuItemType.Standard, () => Edit(b))
}; };
protected override UserActivity InitialActivity => new UserActivity.ChoosingBeatmap(); protected override UserActivity InitialActivity => new UserActivity.ChoosingBeatmap();