sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into non-nullable-beatmapset-files

Browse Source
This commit is contained in:
Bartłomiej Dach
2021-05-31 00:10:03 +02:00
committed by GitHub
parent 8652ac05db be0605450b
commit ab077c6656
23 changed files with 624 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,6 +524,7 @@ namespace osu.Game.Beatmaps
protected override IBeatmap GetBeatmap() => beatmap;
protected override Texture GetBackground() => null;
protected override Track GetBeatmapTrack() => null;
protected override ISkin GetSkin() => null;
public override Stream GetStream(string storagePath) => null;
}
}

3
osu.Game/Beatmaps/DummyWorkingBeatmap.cs
View File

@ -15,6 +15,7 @@ using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.UI;
using osu.Game.Skinning;
namespace osu.Game.Beatmaps
{
@ -49,6 +50,8 @@ namespace osu.Game.Beatmaps
protected override Track GetBeatmapTrack() => GetVirtualTrack();
protected override ISkin GetSkin() => null;
public override Stream GetStream(string storagePath) => null;
private class DummyRulesetInfo : RulesetInfo

2
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -324,7 +324,7 @@ namespace osu.Game.Beatmaps
public bool SkinLoaded => skin.IsResultAvailable;
public ISkin Skin => skin.Value;
protected virtual ISkin GetSkin() => new DefaultSkin(null);
protected abstract ISkin GetSkin();
private readonly RecyclableLazy<ISkin> skin;
public abstract Stream GetStream(string storagePath);