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

dinput_joypad_button - cleanups

Browse Source
This commit is contained in:
twinaphex 2019-07-23 15:34:24 +02:00
parent e0672e46a5
commit ea4f9b4899
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/drivers_joypad/dinput_joypad.c
View File

@ -420,6 +420,7 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
{
unsigned hat_dir = 0;
const struct dinput_joypad_data *pad = &g_pads[port_num];
if (!pad || !pad->joypad)
return false;
@ -431,10 +432,8 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
{
unsigned pov;
unsigned hat = GET_HAT(joykey);
unsigned elems = sizeof(pad->joy_state.rgdwPOV) /
sizeof(pad->joy_state.rgdwPOV[0]);
if (hat >= elems)
if (hat >= ARRAY_SIZE(pad->joy_state.rgdwPOV))
return false;
pov = pad->joy_state.rgdwPOV[hat];
@ -454,15 +453,10 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
return (pov >= 22500) && (pov <= 31500);
}
}
return false;
}
else
{
unsigned elems = sizeof(pad->joy_state.rgbButtons) /
sizeof(pad->joy_state.rgbButtons[0]);
if (joykey < elems)
if (joykey < ARRAY_SIZE(pad->joy_state.rgbButtons))
return pad->joy_state.rgbButtons[joykey];
}