mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

input_menu_keys_pressed - don't use input_joypad_pressed

Browse Source
This commit is contained in:
twinaphex 2017-06-06 07:59:41 +02:00
parent ded0813f6b
commit 7685f93d00
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
input/input_driver.c
View File

@ -680,11 +680,37 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
for (port = 0; port < port_max; port++) for (port = 0; port < port_max; port++)
{ {
if ( (sec && input_joypad_pressed(sec, bool pressed = false;
joypad_info, port, input_config_binds[0], i)) || uint64_t joykey = (input_config_binds[0][i].joykey != NO_BTN)
(first && input_joypad_pressed(first, ? input_config_binds[0][i].joykey : joypad_info.auto_binds[i].joykey;
joypad_info, port, input_config_binds[0], i)) uint32_t joyaxis = (input_config_binds[0][i].joyaxis != AXIS_NONE)
) ? input_config_binds[0][i].joyaxis : joypad_info.auto_binds[i].joyaxis;
if (sec)
{
if ((uint16_t)joykey == NO_BTN || !sec->button(joypad_info.joy_idx, (uint16_t)joykey))
{
int16_t axis = sec->axis(joypad_info.joy_idx, joyaxis);
float scaled_axis = (float)abs(axis) / 0x8000;
pressed = scaled_axis > joypad_info.axis_threshold;
}
else
pressed = true;
}
if (!pressed && first)
{
if ((uint16_t)joykey == NO_BTN || !first->button(joypad_info.joy_idx, (uint16_t)joykey))
{
int16_t axis = first->axis(joypad_info.joy_idx, joyaxis);
float scaled_axis = (float)abs(axis) / 0x8000;
pressed = scaled_axis > joypad_info.axis_threshold;
}
else
pressed = true;
}
if (pressed)
{ {
ret |= (UINT64_C(1) << i); ret |= (UINT64_C(1) << i);
continue; continue;