libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-25 08:59:58 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanup menu_entry_get_type

Browse Source
This commit is contained in:
twinaphex 2015-06-06 21:36:58 +02:00
parent 1d1cd2d0f8
commit d947236dd5
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
menu/menu_entry.c
View File

@ -171,26 +171,42 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
// changed
if (menu_setting_is_of_path_type(setting))
return MENU_ENTRY_PATH;
else if (setting && setting->type == ST_BOOL )
return MENU_ENTRY_BOOL;
else if (setting && setting->type == ST_BIND )
return MENU_ENTRY_BIND;
else if (menu_setting_is_of_enum_type(setting))
if (menu_setting_is_of_enum_type(setting))
return MENU_ENTRY_ENUM;
else if (setting && setting->type == ST_INT )
return MENU_ENTRY_INT;
else if (setting && setting->type == ST_UINT )
return MENU_ENTRY_UINT;
else if (setting && setting->type == ST_FLOAT )
return MENU_ENTRY_FLOAT;
else if (setting && setting->type == ST_PATH )
return MENU_ENTRY_PATH;
else if (setting && setting->type == ST_DIR )
return MENU_ENTRY_DIR;
else if (setting && setting->type == ST_STRING )
return MENU_ENTRY_STRING;
else if (setting && setting->type == ST_HEX )
return MENU_ENTRY_HEX;
if (setting)
{
switch (setting->type)
{
case ST_BOOL:
return MENU_ENTRY_BOOL;
case ST_BIND:
return MENU_ENTRY_BIND;
case ST_INT:
return MENU_ENTRY_INT;
case ST_UINT:
return MENU_ENTRY_UINT;
case ST_FLOAT:
return MENU_ENTRY_FLOAT;
case ST_PATH:
return MENU_ENTRY_PATH;
case ST_DIR:
return MENU_ENTRY_DIR;
case ST_STRING:
return MENU_ENTRY_STRING;
case ST_HEX:
return MENU_ENTRY_HEX;
case ST_NONE:
case ST_ACTION:
case ST_GROUP:
case ST_SUB_GROUP:
case ST_END_GROUP:
case ST_END_SUB_GROUP:
break;
}
}
return MENU_ENTRY_ACTION;
}

2
menu/menu_setting.c
View File

@ -943,7 +943,7 @@ static int setting_action_left_bind_device(void *data, bool wraparound)
static int setting_action_right_bind_device(void *data, bool wraparound)
{
unsigned *p = NULL;
unsigned *p = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr();