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

Use BeatmapSetInfo instead of WorkingBeatmap

Browse Source
This commit is contained in:
Dean Herbert 2017-08-30 20:53:33 +09:00
parent 8619f28ced
commit 2fb4126ffc
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Beatmaps.Drawables
/// </summary>
public Action<BeatmapInfo> StartRequested;
public Action<WorkingBeatmap> DeleteRequested;
public Action<BeatmapSetInfo> DeleteRequested;
public BeatmapSetHeader Header;

2
osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -157,7 +157,7 @@ namespace osu.Game.Beatmaps.Drawables
{
new OsuMenuItem("Play", MenuItemType.Highlighted),
new OsuMenuItem("Edit"),
new OsuMenuItem("Delete", MenuItemType.Destructive),
new OsuMenuItem("Delete", MenuItemType.Destructive, () => DeleteRequested?.Invoke(Beatmap)),
};
}
}

4
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Beatmaps.Drawables
{
public Action<BeatmapSetHeader> GainedSelection;
public Action<WorkingBeatmap> DeleteRequested;
public Action<BeatmapSetInfo> DeleteRequested;
private readonly SpriteText title;
private readonly SpriteText artist;
@ -164,7 +164,7 @@ namespace osu.Game.Beatmaps.Drawables
if (State == PanelSelectedState.NotSelected)
items.Add(new OsuMenuItem("Expand", MenuItemType.Highlighted, () => State = PanelSelectedState.Selected));
items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => DeleteRequested?.Invoke(beatmap)));
items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => DeleteRequested?.Invoke(beatmap.BeatmapSetInfo)));
return items.ToArray();
}

7
osu.Game/Screens/Select/SongSelect.cs
View File

@ -249,7 +249,8 @@ namespace osu.Game.Screens.Select
if (beatmap == null)
{
performLoad();
if (!Beatmap.IsDefault)
performLoad();
}
else
{
@ -390,7 +391,7 @@ namespace osu.Game.Screens.Select
Beatmap.SetDefault();
}
private void promptDelete(WorkingBeatmap beatmap)
private void promptDelete(BeatmapSetInfo beatmap)
{
if (beatmap == null)
return;
@ -412,7 +413,7 @@ namespace osu.Game.Screens.Select
if (state.Keyboard.ShiftPressed)
{
if (!Beatmap.IsDefault)
promptDelete(Beatmap);
promptDelete(Beatmap.Value.BeatmapSetInfo);
return true;
}
break;