mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Merge pull request #8897 from unknownbrackets/font-minor
Font: Skip log on missing zh_gb.pgf
This commit is contained in:
commit
e6fbea4630
1 file changed
+4
-2
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user