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

Cleanup dinput.c

Browse Source
This commit is contained in:
twinaphex 2017-01-10 17:42:57 +01:00
parent d48141041d
commit db6fba51c3
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/drivers/dinput.c
View File

@ -276,20 +276,15 @@ static bool dinput_keyboard_pressed(struct dinput_input *di, unsigned key)
}
static bool dinput_is_pressed(struct dinput_input *di,
rarch_joypad_info_t joypad_info,
const struct retro_keybind *binds,
unsigned port, unsigned id)
{
rarch_joypad_info_t joypad_info;
const struct retro_keybind *bind = &binds[id];
settings_t *settings = config_get_ptr();
if (id >= RARCH_BIND_LIST_END)
return false;
joypad_info.joy_idx = port;
joypad_info.auto_binds = settings->input.autoconf_binds[port];
joypad_info.axis_threshold = settings->input.axis_threshold;
if (!di->blocked && dinput_keyboard_pressed(di, bind->key))
return true;
if (binds && binds[id].valid && input_joypad_pressed(di->joypad, joypad_info, port, binds, id))
@ -476,7 +471,7 @@ static int16_t dinput_input_state(void *data,
switch (device)
{
case RETRO_DEVICE_JOYPAD:
return dinput_is_pressed(di, binds[port], port, id);
return dinput_is_pressed(di, joypad_info, binds[port], port, id);
case RETRO_DEVICE_KEYBOARD:
return dinput_keyboard_pressed(di, id);