h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 16:37:26 +08:00
Code Issues Releases Wiki Activity

Fix multiple remaining warnings

Browse Source
This commit is contained in:
Dean Herbert 2022-01-11 21:36:34 +09:00
parent e8dcbaf29a
commit c06b5951fd
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,11 +43,17 @@ namespace osu.Game.Beatmaps
private readonly RealmContextFactory contextFactory; private readonly RealmContextFactory contextFactory;
public BeatmapManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, IResourceStore<byte[]> gameResources, GameHost? host = null, WorkingBeatmap? defaultBeatmap = null, bool performOnlineLookups = false) public BeatmapManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, IAPIProvider? api, AudioManager audioManager, IResourceStore<byte[]> gameResources, GameHost? host = null, WorkingBeatmap? defaultBeatmap = null, bool performOnlineLookups = false)
{ {
this.contextFactory = contextFactory; this.contextFactory = contextFactory;
if (performOnlineLookups) if (performOnlineLookups)
{
if (api == null)
throw new ArgumentNullException(nameof(api), "API must be provided if online lookups are required.");
onlineBeatmapLookupQueue = new BeatmapOnlineLookupQueue(api, storage); onlineBeatmapLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
}
var userResources = new RealmFileStore(contextFactory, storage).Store; var userResources = new RealmFileStore(contextFactory, storage).Store;
@ -56,7 +62,6 @@ namespace osu.Game.Beatmaps
beatmapModelManager = CreateBeatmapModelManager(storage, contextFactory, rulesets, onlineBeatmapLookupQueue); beatmapModelManager = CreateBeatmapModelManager(storage, contextFactory, rulesets, onlineBeatmapLookupQueue);
workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host); workingBeatmapCache = CreateWorkingBeatmapCache(audioManager, gameResources, userResources, defaultBeatmap, host);
workingBeatmapCache.BeatmapManager = beatmapModelManager;
beatmapModelManager.WorkingBeatmapCache = workingBeatmapCache; beatmapModelManager.WorkingBeatmapCache = workingBeatmapCache;
} }

6
osu.Game/Beatmaps/WorkingBeatmapCache.cs
View File

@ -31,8 +31,6 @@ namespace osu.Game.Beatmaps
/// </summary> /// </summary>
public readonly WorkingBeatmap DefaultBeatmap; public readonly WorkingBeatmap DefaultBeatmap;
public BeatmapModelManager BeatmapManager { private get; set; }
private readonly AudioManager audioManager; private readonly AudioManager audioManager;
private readonly IResourceStore<byte[]> resources; private readonly IResourceStore<byte[]> resources;
private readonly LargeTextureStore largeTextureStore; private readonly LargeTextureStore largeTextureStore;
@ -87,7 +85,6 @@ namespace osu.Game.Beatmaps
return working; return working;
// TODO: FUCK THE WORLD :D // TODO: FUCK THE WORLD :D
if (beatmapInfo?.IsManaged == true)
beatmapInfo = beatmapInfo.Detach(); beatmapInfo = beatmapInfo.Detach();
workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this)); workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
@ -193,6 +190,9 @@ namespace osu.Game.Beatmaps
{ {
Storyboard storyboard; Storyboard storyboard;
if (BeatmapInfo.Path == null)
return new Storyboard();
try try
{ {
using (var stream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path)))) using (var stream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path))))