diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 77bf5d76c9..4a9d124c5d 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -907,7 +907,7 @@ static void mui_font(menu_handle_t *menu) fill_pathname_join(mediapath, settings->assets_directory, "glui", sizeof(mediapath)); fill_pathname_join(fontpath, mediapath, "Roboto-Regular.ttf", sizeof(fontpath)); - if (!menu_display_init_main_font(menu, fontpath, font_size)) + if (!menu_display_init_main_font(fontpath, font_size)) RARCH_WARN("Failed to load font."); } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 28ce4233c3..8806325df5 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1836,7 +1836,7 @@ static void xmb_font(menu_handle_t *menu) fill_pathname_join(themepath, mediapath, XMB_THEME, sizeof(themepath)); fill_pathname_join(fontpath, themepath, "font.ttf", sizeof(fontpath)); - if (!menu_display_init_main_font(menu, fontpath, font_size)) + if (!menu_display_init_main_font(fontpath, font_size)) RARCH_WARN("Failed to load font."); } diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index eac6d3c219..989608a087 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -215,7 +215,7 @@ static void zarch_zui_font(menu_handle_t *menu) fill_pathname_join(mediapath, settings->assets_directory, "zarch", sizeof(mediapath)); fill_pathname_join(fontpath, mediapath, "Roboto-Condensed.ttf", sizeof(fontpath)); - if (!menu_display_init_main_font(menu, fontpath, font_size)) + if (!menu_display_init_main_font(fontpath, font_size)) RARCH_WARN("Failed to load font."); } @@ -1190,7 +1190,7 @@ static void zarch_context_reset(void) zui = (zui_t*)menu->userdata; font_path = settings->video.font_enable ? settings->video.font_path : NULL; - if (!menu_display_init_main_font(menu, font_path, zui->font_size)) + if (!menu_display_init_main_font(font_path, zui->font_size)) RARCH_WARN("Failed to load font."); zarch_context_bg_destroy(zui); diff --git a/menu/menu_display.c b/menu/menu_display.c index fabc7d2936..a7b3149b13 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -228,8 +228,7 @@ bool menu_display_driver_init_first(void) return false; } -bool menu_display_init_main_font(void *data, - const char *font_path, float font_size) +bool menu_display_init_main_font(const char *font_path, float font_size) { bool ret; void *video = video_driver_get_ptr(false); diff --git a/menu/menu_display.h b/menu/menu_display.h index e8af5d71b3..5f6b58029c 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -127,8 +127,7 @@ bool menu_display_font_bind_block(void *userdata); bool menu_display_font_flush_block(void); -bool menu_display_init_main_font(void *data, - const char *font_path, float font_size); +bool menu_display_init_main_font(const char *font_path, float font_size); void menu_display_free_main_font(void);