RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

osu!-side changes in-line with framework BDL cache changes

This commit is contained in:
smoogipoo 2018-01-22 12:56:30 +09:00
parent 64c32f5715
commit b4e1872322
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGame.cs
View File

@ -110,7 +110,7 @@ private void load(FrameworkConfigManager frameworkConfig)
Task.Run(() => BeatmapManager.Import(paths.ToArray())); Task.Run(() => BeatmapManager.Import(paths.ToArray()));
} }
dependencies.Cache(this); dependencies.CacheAs<OsuGame>(this);
configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset); configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First(); Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();

4
osu.Game/OsuGameBase.cs
View File

@ -93,7 +93,7 @@ private void load()
dependencies.Cache(new LargeTextureStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")))); dependencies.Cache(new LargeTextureStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures"))));
dependencies.Cache(this); dependencies.CacheAs<OsuGameBase>(this);
dependencies.Cache(LocalConfig); dependencies.Cache(LocalConfig);
runMigrations(); runMigrations();
@ -112,7 +112,7 @@ private void load()
dependencies.Cache(new OsuColour()); dependencies.Cache(new OsuColour());
//this completely overrides the framework default. will need to change once we make a proper FontStore. //this completely overrides the framework default. will need to change once we make a proper FontStore.
dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 }, true); dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 });
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -181,7 +181,7 @@ protected SongSelect()
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours) private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours)
{ {
dependencies.Cache(this); dependencies.CacheAs<SongSelect>(this);
if (Footer != null) if (Footer != null)
{ {