CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-15 23:06:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix input remapping menu display

Browse Source
This commit is contained in:
Toad King 2015-06-08 19:41:00 -05:00
parent d97a056903
commit c7a6b85817
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu.h
View File

@ -143,7 +143,7 @@ typedef enum
MENU_SETTINGS_CHEAT_BEGIN,
MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1),
MENU_SETTINGS_INPUT_DESC_BEGIN,
MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + (MAX_USERS * RARCH_CUSTOM_BIND_LIST_END),
MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + (MAX_USERS * (RARCH_FIRST_CUSTOM_BIND + 4)),
} menu_settings_t;
/**
@ -165,7 +165,7 @@ void *menu_init(const void *data);
*
* Runs RetroArch menu for one frame.
*
* Returns: 0 on success, -1 if we need to quit out of the loop.
* Returns: 0 on success, -1 if we need to quit out of the loop.
**/
int menu_iterate(retro_input_t input,
retro_input_t old_input, retro_input_t trigger_input);

6
menu/menu_displaylist.c
View File

@ -1319,7 +1319,7 @@ static void menu_displaylist_push_horizontal_menu_list_content(
file_list_t *list, core_info_t *info, const char* path)
{
unsigned j;
struct string_list *str_list =
struct string_list *str_list =
dir_list_new(path, info->supported_extensions, true);
if (!str_list)
@ -1529,7 +1529,7 @@ static int menu_displaylist_parse_options_remappings(menu_displaylist_info_t *in
"User %u %s : ", user, description);
menu_list_push(info->list, desc_label, "",
MENU_SETTINGS_INPUT_DESC_BEGIN +
(p * RARCH_FIRST_META_KEY) + retro_id, 0);
(p * (RARCH_FIRST_CUSTOM_BIND + 4)) + retro_id, 0);
}
}
@ -1657,7 +1657,7 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n
case MENU_LABEL_CONTENT_COLLECTION_LIST:
if (is_dir)
continue;
file_type = MENU_FILE_PLAYLIST_COLLECTION;
break;
case MENU_LABEL_CORE_LIST: