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

Split out BeatmapDatabase into BeatmapStore

Browse Source 
Hide database functionality at a lower level in preparation from eventually making it private.
This commit is contained in:
Dean Herbert
2017-07-26 16:28:32 +09:00
parent fce580d717
commit 9e20a02c0a
22 changed files with 428 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ namespace osu.Game.Screens.Menu
private Track track;
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps, Framework.Game game)
private void load(AudioManager audio, OsuConfigManager config, BeatmapStore beatmaps, Framework.Game game)
{
menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
@ -76,7 +76,7 @@ namespace osu.Game.Screens.Menu
if (!menuMusic)
{
var query = beatmaps.Query<BeatmapSetInfo>().Where(b => !b.DeletePending);
var query = beatmaps.Database.Query<BeatmapSetInfo>().Where(b => !b.DeletePending);
int count = query.Count();
if (count > 0)
setInfo = query.ElementAt(RNG.Next(0, count - 1));
@ -84,7 +84,7 @@ namespace osu.Game.Screens.Menu
if (setInfo == null)
{
var query = beatmaps.Query<BeatmapSetInfo>().Where(b => b.Hash == MENU_MUSIC_BEATMAP_HASH);
var query = beatmaps.Database.Query<BeatmapSetInfo>().Where(b => b.Hash == MENU_MUSIC_BEATMAP_HASH);
setInfo = query.FirstOrDefault();
@ -96,11 +96,11 @@ namespace osu.Game.Screens.Menu
setInfo = query.First();
setInfo.DeletePending = true;
beatmaps.Update(setInfo, false);
beatmaps.Database.Update(setInfo, false);
}
}
beatmaps.GetChildren(setInfo);
beatmaps.Database.GetChildren(setInfo);
Beatmap.Value = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
track = Beatmap.Value.Track;