ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2016-02-25 18:37:43 +01:00
parent b870aaf2fa
commit 00a958edc2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/menu_setting.c
View File

@ -2572,17 +2572,17 @@ static int setting_action_ok_bind_all_save_autoconfig(void *data, bool wraparoun
static int setting_action_ok_bind_defaults(void *data, bool wraparound) static int setting_action_ok_bind_defaults(void *data, bool wraparound)
{ {
unsigned i; unsigned i;
struct retro_keybind *target = NULL; struct retro_keybind *target = NULL;
const struct retro_keybind *def_binds = NULL; const struct retro_keybind *def_binds = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
(void)wraparound; (void)wraparound;
if (!setting) if (!setting)
return -1; return -1;
target = (struct retro_keybind*) target = (struct retro_keybind*)
&settings->input.binds[setting->index_offset][0]; &settings->input.binds[setting->index_offset][0];
def_binds = (setting->index_offset) ? def_binds = (setting->index_offset) ?
retro_keybinds_rest : retro_keybinds_1; retro_keybinds_rest : retro_keybinds_1;
@ -2596,8 +2596,8 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
for (i = MENU_SETTINGS_BIND_BEGIN; for (i = MENU_SETTINGS_BIND_BEGIN;
i <= MENU_SETTINGS_BIND_LAST; i++, target++) i <= MENU_SETTINGS_BIND_LAST; i++, target++)
{ {
target->key = def_binds[i - MENU_SETTINGS_BIND_BEGIN].key; target->key = def_binds[i - MENU_SETTINGS_BIND_BEGIN].key;
target->joykey = NO_BTN; target->joykey = NO_BTN;
target->joyaxis = AXIS_NONE; target->joyaxis = AXIS_NONE;
} }