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

Revert "Move beatmap skin info creation to static method at IBeatmapSkin"

Browse Source 
This reverts commit 9806d94b74.
This commit is contained in:
Salman Ahmed 2021-05-27 05:08:49 +03:00
parent 14a4095140
commit 0c2d3ae0e7
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Skinning/BeatmapSkinExtensions.cs
View File

@ -1,16 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Beatmaps;
namespace osu.Game.Skinning
{
public static class BeatmapSkinExtensions
{
public static SkinInfo CreateSkinInfo(BeatmapInfo beatmap) => new SkinInfo
{
Name = beatmap.ToString(),
Creator = beatmap.Metadata?.AuthorString,
};
}
}

5
osu.Game/Skinning/LegacyBeatmapSkin.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Skinning
protected override bool UseCustomSampleBanks => true;
public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
: base(BeatmapSkinExtensions.CreateSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), resources, beatmap.Path)
: base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), resources, beatmap.Path)
{
// Disallow default colours fallback on beatmap skins to allow using parent skin combo colours. (via SkinProvidingContainer)
Configuration.AllowDefaultComboColoursFallback = false;
@ -49,5 +49,8 @@ namespace osu.Game.Skinning
return base.GetSample(sampleInfo);
}
private static SkinInfo createSkinInfo(BeatmapInfo beatmap) =>
new SkinInfo { Name = beatmap.ToString(), Creator = beatmap.Metadata.Author.ToString() };
}
}