diff --git a/config.def.h b/config.def.h index a56560c4c0..d517d05048 100644 --- a/config.def.h +++ b/config.def.h @@ -225,7 +225,7 @@ static const bool crop_overscan = true; #ifdef HAVE_RMENU static const float font_size = 1.0f; #else -static const unsigned font_size = 48; +static const float font_size = 48; #endif // Attempt to scale the font size. // The scale factor will be window_size / desktop_size. diff --git a/general.h b/general.h index a47605a2ac..dab1f43583 100644 --- a/general.h +++ b/general.h @@ -168,11 +168,7 @@ struct settings char shader_dir[PATH_MAX]; char font_path[PATH_MAX]; -#ifdef HAVE_RMENU float font_size; -#else - unsigned font_size; -#endif bool font_enable; bool font_scale; float msg_pos_x; diff --git a/settings.c b/settings.c index e8bd61f198..c9db6f3668 100644 --- a/settings.c +++ b/settings.c @@ -448,11 +448,7 @@ bool config_load_file(const char *path) CONFIG_GET_BOOL(video.allow_rotate, "video_allow_rotate"); CONFIG_GET_PATH(video.font_path, "video_font_path"); -#ifdef HAVE_RMENU CONFIG_GET_FLOAT(video.font_size, "video_font_size"); -#else - CONFIG_GET_INT(video.font_size, "video_font_size"); -#endif CONFIG_GET_BOOL(video.font_enable, "video_font_enable"); CONFIG_GET_BOOL(video.font_scale, "video_font_scale"); CONFIG_GET_FLOAT(video.msg_pos_x, "video_message_pos_x"); @@ -1205,11 +1201,7 @@ bool config_save_file(const char *path) config_set_int(conf, "zip_extract_mode", g_extern.file_state.zip_extract_mode); #endif -#ifdef HAVE_RMENU config_set_float(conf, "video_font_size", g_settings.video.font_size); -#else - config_set_int(conf, "video_font_size", g_settings.video.font_size); -#endif // g_extern config_set_int(conf, "sound_mode", g_extern.console.sound.mode);