mirror of
https://github.com/libretro/RetroArch
synced 2025-04-18 14:42:30 +00:00
Merge pull request #9193 from jdgleaver/cheevos-fix
Achievements menu fixes
This commit is contained in:
commit
f654a5f692
@ -1630,7 +1630,8 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type >= MENU_SETTINGS_CORE_OPTION_START)
|
if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
|
||||||
|
(type < MENU_SETTINGS_CHEEVOS_START))
|
||||||
{
|
{
|
||||||
BIND_ACTION_GET_VALUE(cbs,
|
BIND_ACTION_GET_VALUE(cbs,
|
||||||
menu_action_setting_disp_set_label_core_options);
|
menu_action_setting_disp_set_label_core_options);
|
||||||
|
@ -727,7 +727,8 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
|
|||||||
{
|
{
|
||||||
BIND_ACTION_LEFT(cbs, action_left_input_desc_kbd);
|
BIND_ACTION_LEFT(cbs, action_left_input_desc_kbd);
|
||||||
}
|
}
|
||||||
else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
|
else if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
|
||||||
|
(type < MENU_SETTINGS_CHEEVOS_START))
|
||||||
{
|
{
|
||||||
BIND_ACTION_LEFT(cbs, core_setting_left);
|
BIND_ACTION_LEFT(cbs, core_setting_left);
|
||||||
}
|
}
|
||||||
|
@ -6605,7 +6605,8 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
|
|||||||
{
|
{
|
||||||
BIND_ACTION_OK(cbs, action_ok_cheat);
|
BIND_ACTION_OK(cbs, action_ok_cheat);
|
||||||
}
|
}
|
||||||
else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
|
else if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
|
||||||
|
(type < MENU_SETTINGS_CHEEVOS_START))
|
||||||
{
|
{
|
||||||
BIND_ACTION_OK(cbs, action_ok_core_option_dropdown_list);
|
BIND_ACTION_OK(cbs, action_ok_core_option_dropdown_list);
|
||||||
}
|
}
|
||||||
|
@ -608,7 +608,8 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
|
|||||||
{
|
{
|
||||||
BIND_ACTION_RIGHT(cbs, action_right_input_desc_kbd);
|
BIND_ACTION_RIGHT(cbs, action_right_input_desc_kbd);
|
||||||
}
|
}
|
||||||
else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
|
else if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
|
||||||
|
(type < MENU_SETTINGS_CHEEVOS_START))
|
||||||
{
|
{
|
||||||
BIND_ACTION_RIGHT(cbs, core_setting_right);
|
BIND_ACTION_RIGHT(cbs, core_setting_right);
|
||||||
}
|
}
|
||||||
|
@ -257,7 +257,8 @@ int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((type >= MENU_SETTINGS_CORE_OPTION_START))
|
if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
|
||||||
|
(type < MENU_SETTINGS_CHEEVOS_START))
|
||||||
{
|
{
|
||||||
BIND_ACTION_SELECT(cbs, action_select_core_setting);
|
BIND_ACTION_SELECT(cbs, action_select_core_setting);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -358,7 +358,8 @@ static int menu_cbs_init_bind_start_compare_type(menu_file_list_cbs_t *cbs,
|
|||||||
{
|
{
|
||||||
BIND_ACTION_START(cbs, action_start_performance_counters_frontend);
|
BIND_ACTION_START(cbs, action_start_performance_counters_frontend);
|
||||||
}
|
}
|
||||||
else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
|
else if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
|
||||||
|
(type < MENU_SETTINGS_CHEEVOS_START))
|
||||||
{
|
{
|
||||||
BIND_ACTION_START(cbs, action_start_core_setting);
|
BIND_ACTION_START(cbs, action_start_core_setting);
|
||||||
}
|
}
|
||||||
|
@ -1124,7 +1124,8 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (type >= MENU_SETTINGS_CORE_OPTION_START)
|
if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
|
||||||
|
(type < MENU_SETTINGS_CHEEVOS_START))
|
||||||
{
|
{
|
||||||
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_option);
|
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_option);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user