mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Streamline hat lookup.

Browse Source
This commit is contained in:
Themaister 2012-02-18 12:32:49 +01:00
parent 947d2a3514
commit aac2533075
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
input/sdl_input.c
View File

@ -193,40 +193,33 @@ static bool sdl_joykey_pressed(sdl_input_t *sdl, int port_num, uint16_t joykey)
// Check hat. // Check hat.
if (GET_HAT_DIR(joykey)) if (GET_HAT_DIR(joykey))
{ {
int hat = GET_HAT(joykey); uint16_t hat = GET_HAT(joykey);
if (hat < (int)sdl->num_hats[port_num]) if (hat >= sdl->num_hats[port_num])
{ return false;
Uint8 dir = SDL_JoystickGetHat(sdl->joysticks[port_num], hat); Uint8 dir = SDL_JoystickGetHat(sdl->joysticks[port_num], hat);
switch (GET_HAT_DIR(joykey)) switch (GET_HAT_DIR(joykey))
{ {
case HAT_UP_MASK: case HAT_UP_MASK:
if (dir & SDL_HAT_UP) return dir & SDL_HAT_UP;
return true;
break;
case HAT_DOWN_MASK: case HAT_DOWN_MASK:
if (dir & SDL_HAT_DOWN) return dir & SDL_HAT_DOWN;
return true;
break;
case HAT_LEFT_MASK: case HAT_LEFT_MASK:
if (dir & SDL_HAT_LEFT) return dir & SDL_HAT_LEFT;
return true;
break;
case HAT_RIGHT_MASK: case HAT_RIGHT_MASK:
if (dir & SDL_HAT_RIGHT) return dir & SDL_HAT_RIGHT;
return true;
break;
default: default:
break; return false;
}
} }
} }
else // Check the button else // Check the button
{ {
if (joykey < sdl->num_buttons[port_num] && SDL_JoystickGetButton(sdl->joysticks[port_num], joykey)) if (joykey < sdl->num_buttons[port_num] && SDL_JoystickGetButton(sdl->joysticks[port_num], joykey))
return true; return true;
}
return false; return false;
} }
}
static bool sdl_axis_pressed(sdl_input_t *sdl, int port_num, uint32_t joyaxis) static bool sdl_axis_pressed(sdl_input_t *sdl, int port_num, uint32_t joyaxis)
{ {