diff options
Diffstat (limited to 'src/resource_loader.c')
| -rw-r--r-- | src/resource_loader.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/resource_loader.c b/src/resource_loader.c index d589373..2eb0c01 100644 --- a/src/resource_loader.c +++ b/src/resource_loader.c @@ -22,24 +22,28 @@ mgl_font* mgui_get_font(mgui_font_type type, unsigned int character_size) { if(!font_file) { const char *font_paths[2]; size_t num_font_paths = 0; + const char *font_name = ""; switch(type) { case MGUI_FONT_LATIN: { font_paths[0] = "/usr/share/fonts/noto/NotoSans-Regular.ttf"; font_paths[1] = "/usr/share/fonts/truetype/noto/NotoSans-Regular.ttf"; num_font_paths = 2; + font_name = "NotoSans-Regular.ttf"; break; } case MGUI_FONT_LATIN_BOLD: { font_paths[0] = "/usr/share/fonts/noto/NotoSans-Bold.ttf"; font_paths[1] = "/usr/share/fonts/truetype/noto/NotoSans-Bold.ttf"; num_font_paths = 2; + font_name = "NotoSans-Bold.ttf"; break; } case MGUI_FONT_CJK: { - font_paths[0] = "/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttf"; - font_paths[1] = "/usr/share/fonts/truetype/noto-cjk/NotoSansCJK-Regular.ttf"; + font_paths[0] = "/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"; + font_paths[1] = "/usr/share/fonts/truetype/noto-cjk/NotoSansCJK-Regular.ttc"; num_font_paths = 2; + font_name = "NotoSansCJK-Regular.ttc"; break; } } @@ -60,13 +64,13 @@ mgl_font* mgui_get_font(mgui_font_type type, unsigned int character_size) { } if(!successfully_loaded_file) - fprintf(stderr, "mgui warning: mgui_get_font failed to load font %d\n", (int)type); + fprintf(stderr, "mgui warning: mgui_get_font failed to load font %s\n", font_name); font_file_cache[type] = new_font_file; font_file = new_font_file; } - if(!font_file) + if(!font_file->data) return NULL; mgl_font *font = font_cache[type][character_size]; |