mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

See prior commit message

Browse Source
This commit is contained in:
twinaphex 2014-10-20 22:45:19 +02:00
parent 7518eb27e6
commit 29e74b2372
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
settings.c
View File

@ -1290,41 +1290,41 @@ static void parse_config_file(void)
static void read_keybinds_keyboard(config_file_t *conf, unsigned player,
unsigned index, struct retro_keybind *bind)
unsigned idx, struct retro_keybind *bind)
{
if (input_config_bind_map[index].valid && input_config_bind_map[index].base)
if (input_config_bind_map[idx].valid && input_config_bind_map[idx].base)
{
const char *prefix = input_config_get_prefix(player,
input_config_bind_map[index].meta);
input_config_bind_map[idx].meta);
if (prefix)
input_config_parse_key(conf, prefix,
input_config_bind_map[index].base, bind);
input_config_bind_map[idx].base, bind);
}
}
static void read_keybinds_button(config_file_t *conf, unsigned player,
unsigned index, struct retro_keybind *bind)
unsigned idx, struct retro_keybind *bind)
{
if (input_config_bind_map[index].valid && input_config_bind_map[index].base)
if (input_config_bind_map[idx].valid && input_config_bind_map[idx].base)
{
const char *prefix = input_config_get_prefix(player,
input_config_bind_map[index].meta);
input_config_bind_map[idx].meta);
if (prefix)
input_config_parse_joy_button(conf, prefix,
input_config_bind_map[index].base, bind);
input_config_bind_map[idx].base, bind);
}
}
static void read_keybinds_axis(config_file_t *conf, unsigned player,
unsigned index, struct retro_keybind *bind)
unsigned idx, struct retro_keybind *bind)
{
if (input_config_bind_map[index].valid && input_config_bind_map[index].base)
if (input_config_bind_map[idx].valid && input_config_bind_map[idx].base)
{
const char *prefix = input_config_get_prefix(player,
input_config_bind_map[index].meta);
input_config_bind_map[idx].meta);
if (prefix)
input_config_parse_joy_axis(conf, prefix,
input_config_bind_map[index].base, bind);
input_config_bind_map[idx].base, bind);
}
}

6
string_list.c
View File

@ -86,10 +86,10 @@ bool string_list_append(struct string_list *list, const char *elem,
}
void string_list_set(struct string_list *list,
unsigned index, const char *str)
unsigned idx, const char *str)
{
free(list->elems[index].data);
rarch_assert(list->elems[index].data = strdup(str));
free(list->elems[idx].data);
rarch_assert(list->elems[idx].data = strdup(str));
}
void string_list_join_concat(char *buffer, size_t size,