From 965501393810098babc2d1032fde3228000f19d4 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Aug 2016 10:27:27 -0700 Subject: [PATCH] Font: Skip log on missing zh_gb.pgf. Fixes #8332. --- Core/HLE/sceFont.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 86f5b1d711..1402a908ef 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -82,10 +82,12 @@ struct FontRegistryEntry { const char *fontName; int expireDate; int shadow_option; + bool ignoreIfMissing; }; static const FontRegistryEntry fontRegistry[] = { - { 0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SANS_SERIF, FONT_STYLE_DB, 0, FONT_LANGUAGE_CHINESE, 0, 1, "zh_gb.pgf", "FTT-NewRodin Pro DB", 0, 0 }, + // This was added for Chinese translations and is not normally loaded on a PSP. + { 0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SANS_SERIF, FONT_STYLE_DB, 0, FONT_LANGUAGE_CHINESE, 0, 1, "zh_gb.pgf", "FTT-NewRodin Pro DB", 0, 0, true }, { 0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SANS_SERIF, FONT_STYLE_DB, 0, FONT_LANGUAGE_JAPANESE, 0, 1, "jpn0.pgf", "FTT-NewRodin Pro DB", 0, 0 }, {0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SANS_SERIF, FONT_STYLE_REGULAR, 0, FONT_LANGUAGE_LATIN, 0, 1, "ltn0.pgf", "FTT-NewRodin Pro Latin", 0, 0}, {0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SERIF, FONT_STYLE_REGULAR, 0, FONT_LANGUAGE_LATIN, 0, 1, "ltn1.pgf", "FTT-Matisse Pro Latin", 0, 0}, @@ -690,7 +692,7 @@ static void __LoadInternalFonts() { internalFonts.push_back(new Font(buffer, entry)); DEBUG_LOG(SCEFONT, "Loaded font %s", fontFilename.c_str()); - } else { + } else if (!entry.ignoreIfMissing) { WARN_LOG(SCEFONT, "Font file not found: %s", fontFilename.c_str()); } }