h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 14:22:55 +08:00
Code Issues Releases Wiki Activity

Re-cache the new FontStore when overwritten

Browse Source 
Fixes issues with font loading
This commit is contained in:
Drew DeVault 2016-11-08 18:51:39 -05:00
parent fe9034323b
commit 2362665b8a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game/OsuGameBase.cs
View File

@ -45,25 +45,11 @@ namespace osu.Game
private void Load()
{
Dependencies.Cache(this);
Dependencies.Cache<OsuConfigManager>(new OsuConfigManager(Host.Storage));
Dependencies.Cache(new OsuConfigManager(Host.Storage));
Dependencies.Cache(new BeatmapDatabase(Host.Storage, Host));
AddInternal(ratioContainer = new RatioAdjust());
Children = new Drawable[]
{
Options = new OptionsOverlay(),
Cursor = new OsuCursorContainer { Depth = float.MaxValue }
};
Dependencies.Cache(Options);
Beatmap.ValueChanged += Beatmap_ValueChanged;
OszArchiveReader.Register();
//this completely overrides the framework default. will need to change once we make a proper FontStore.
Fonts = new FontStore { ScaleAdjust = 0.01f };
Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f });
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
@ -79,6 +65,20 @@ namespace osu.Game
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Black"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic"));
AddInternal(ratioContainer = new RatioAdjust());
Children = new Drawable[]
{
Options = new OptionsOverlay(),
Cursor = new OsuCursorContainer { Depth = float.MaxValue }
};
Dependencies.Cache(Options);
Beatmap.ValueChanged += Beatmap_ValueChanged;
OszArchiveReader.Register();
Dependencies.Cache(API = new APIAccess
{