diff --git a/core/src/main/assets/pixel_font.ttf b/core/src/main/assets/pixel_font.ttf index 81acec2bc..63e4d8ce9 100644 Binary files a/core/src/main/assets/pixel_font.ttf and b/core/src/main/assets/pixel_font.ttf differ diff --git a/desktop/src/main/assets/DroidSansFallback.ttf b/desktop/src/main/assets/DroidSansFallback.ttf index 38b5b1a53..42cd4832e 100644 Binary files a/desktop/src/main/assets/DroidSansFallback.ttf and b/desktop/src/main/assets/DroidSansFallback.ttf differ diff --git a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java index d8ab88eaa..e22136e1f 100644 --- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java +++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java @@ -120,9 +120,12 @@ public class DesktopPlatformSupport extends PlatformSupport { } fonts = new HashMap<>(); - //FIXME systemfont setting is currently ignored as DroidSandFallback.ttf is missing key characters - basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf")); - asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("DroidSansFallback.ttf")); + if (systemfont) { + basicFontGenerator = asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("DroidSansFallback.ttf")); + } else { + basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf")); + asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("DroidSansFallback.ttf")); + } fonts.put(basicFontGenerator, basicFonts); fonts.put(asianFontGenerator, asianFonts);