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

(CTR) Buildfix

Browse Source
This commit is contained in:
twinaphex 2020-06-11 20:59:35 +02:00
parent 11520f9704
commit 8cc220a4d2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/drivers/ctr_input.c
View File

@ -51,10 +51,10 @@ static int16_t ctr_is_pressed(
{ {
const struct retro_keybind *bind = &binds[id]; const struct retro_keybind *bind = &binds[id];
/* Auto-binds are per joypad, not per user. */ /* Auto-binds are per joypad, not per user. */
const uint64_t joykey = (binds[port][id].joykey != NO_BTN) const uint64_t joykey = (binds[id].joykey != NO_BTN)
? binds[port][id].joykey : joypad_info->auto_binds[id].joykey; ? binds[id].joykey : joypad_info->auto_binds[id].joykey;
const uint32_t joyaxis = (binds[port][id].joyaxis != AXIS_NONE) const uint32_t joyaxis = (binds[id].joyaxis != AXIS_NONE)
? binds[port][id].joyaxis : joypad_info->auto_binds[id].joyaxis; ? binds[id].joyaxis : joypad_info->auto_binds[id].joyaxis;
if ((uint16_t)joykey != NO_BTN && if ((uint16_t)joykey != NO_BTN &&
joypad->button( joypad->button(
joypad_info->joy_idx, (uint16_t)joykey)) joypad_info->joy_idx, (uint16_t)joykey))

2
input/drivers/winraw_input.c
View File

@ -325,7 +325,7 @@ static int16_t winraw_is_pressed(
const struct retro_keybind *bind = &binds[id]; const struct retro_keybind *bind = &binds[id];
/* Auto-binds are per joypad, not per user. */ /* Auto-binds are per joypad, not per user. */
const uint64_t joykey = (binds[id].joykey != NO_BTN) const uint64_t joykey = (binds[id].joykey != NO_BTN)
? binds[id].joykey : joypad_info->auto_binds[id].joykey; ? binds[id].joykey : joypad_info->auto_binds[id].joykey;
const uint32_t joyaxis = (binds[id].joyaxis != AXIS_NONE) const uint32_t joyaxis = (binds[id].joyaxis != AXIS_NONE)
? binds[id].joyaxis : joypad_info->auto_binds[id].joyaxis; ? binds[id].joyaxis : joypad_info->auto_binds[id].joyaxis;
if (mouse && winraw_mouse_button_pressed(wr, if (mouse && winraw_mouse_button_pressed(wr,