(Menu) Refactor MENU_SETTINGS_GENERAL_OPTIONS

This commit is contained in:
twinaphex 2014-09-04 18:58:53 +02:00
parent 7af2d2f31c
commit fac795f796
3 changed files with 3 additions and 4 deletions

View File

@ -644,7 +644,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
{
if (
type == MENU_SETTINGS ||
type == MENU_SETTINGS_GENERAL_OPTIONS ||
!strcmp(label, "General Options") ||
!strcmp(label, "core_options") ||
!strcmp(label, "core_information") ||
type == MENU_SETTINGS_VIDEO_OPTIONS ||

View File

@ -87,8 +87,7 @@ typedef enum
typedef enum
{
// Shader stuff
MENU_SETTINGS_GENERAL_OPTIONS = MENU_SETTINGS + 1,
MENU_SETTINGS_VIDEO_OPTIONS,
MENU_SETTINGS_VIDEO_OPTIONS = MENU_SETTINGS + 1,
MENU_SETTINGS_VIDEO_RESOLUTION,
MENU_SETTINGS_CUSTOM_VIEWPORT,
MENU_SETTINGS_FONT_OPTIONS,

View File

@ -497,7 +497,7 @@ int menu_entries_push_list(menu_handle_t *menu,
case MENU_SETTINGS_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"Driver Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"General Options", MENU_SETTINGS_GENERAL_OPTIONS, setting_data);
add_setting_entry(menu,list,"General Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Video Options", MENU_SETTINGS_VIDEO_OPTIONS, setting_data);
add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data);