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

Moved menu music hash property back to intro and changed check (before undeleting) to "Protected" field.

Browse Source
This commit is contained in:
FreezyLemon 2017-12-10 11:31:37 +01:00
parent 1691a74b14
commit 8cbd6f32cb
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -34,11 +34,6 @@ namespace osu.Game.Beatmaps
/// </summary> /// </summary>
public class BeatmapManager public class BeatmapManager
{ {
/// <summary>
/// The hash of the supplied menu music's beatmap set.
/// </summary>
public const string MENU_MUSIC_BEATMAP_HASH = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
/// <summary> /// <summary>
/// Fired when a new <see cref="BeatmapSetInfo"/> becomes available in the database. /// Fired when a new <see cref="BeatmapSetInfo"/> becomes available in the database.
/// </summary> /// </summary>
@ -346,8 +341,7 @@ namespace osu.Game.Beatmaps
public void Undelete(BeatmapSetInfo beatmapSet) public void Undelete(BeatmapSetInfo beatmapSet)
{ {
// So circles.osz doesn't get added as a map if (beatmapSet.Protected)
if (beatmapSet.Hash == MENU_MUSIC_BEATMAP_HASH)
return; return;
lock (importContext) lock (importContext)

4
osu.Game/Screens/Menu/Intro.cs
View File

@ -20,6 +20,8 @@ namespace osu.Game.Screens.Menu
{ {
public class Intro : OsuScreen public class Intro : OsuScreen
{ {
private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
/// <summary> /// <summary>
/// Whether we have loaded the menu previously. /// Whether we have loaded the menu previously.
/// </summary> /// </summary>
@ -56,7 +58,7 @@ namespace osu.Game.Screens.Menu
if (setInfo == null) if (setInfo == null)
{ {
setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapManager.MENU_MUSIC_BEATMAP_HASH); setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == menu_music_beatmap_hash);
if (setInfo == null) if (setInfo == null)
{ {