mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(OSX) Buildfix

Browse Source
This commit is contained in:
twinaphex 2020-06-11 21:00:28 +02:00
parent 8cc220a4d2
commit 88a93dc648
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/drivers/cocoa_input.c
View File

@ -299,7 +299,7 @@ static int16_t cocoa_is_pressed(
{ {
/* 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 ((uint16_t)joykey != NO_BTN && joypad->button( if ((uint16_t)joykey != NO_BTN && joypad->button(
@ -335,7 +335,7 @@ static int16_t cocoa_input_state(void *data,
int16_t ret = 0; int16_t ret = 0;
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++) for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
{ {
if (apple_key_state[rarch_keysym_lut[binds[i].key]]) if (apple_key_state[rarch_keysym_lut[binds[port][i].key]])
return 1; return 1;
if (cocoa_is_pressed( if (cocoa_is_pressed(
apple->joypad, apple->sec_joypad, apple->joypad, apple->sec_joypad,
@ -347,7 +347,7 @@ static int16_t cocoa_input_state(void *data,
else else
{ {
if (id < RARCH_BIND_LIST_END) if (id < RARCH_BIND_LIST_END)
if (apple_key_state[rarch_keysym_lut[binds[id].key]]) if (apple_key_state[rarch_keysym_lut[binds[port][id].key]])
return 1; return 1;
return cocoa_is_pressed( return cocoa_is_pressed(
apple->joypad, apple->sec_joypad, apple->joypad, apple->sec_joypad,