ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move device masking to upper function

This commit is contained in:
twinaphex 2019-06-24 02:20:24 +02:00
parent 6f1f17cda4
commit 0dcbb985be
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retroarch.c
View File

@ -2532,8 +2532,6 @@ static int16_t input_state_internal(
is in action for that button*/ is in action for that button*/
bool reset_state = false; bool reset_state = false;
device &= RETRO_DEVICE_MASK;
if (bsv_movie_get_input(&bsv_result)) if (bsv_movie_get_input(&bsv_result))
return bsv_result; return bsv_result;
@ -2684,6 +2682,7 @@ static int16_t input_state_internal(
int16_t input_state(unsigned port, unsigned device, int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id) unsigned idx, unsigned id)
{ {
device &= RETRO_DEVICE_MASK;
if ( (device == RETRO_DEVICE_JOYPAD) && if ( (device == RETRO_DEVICE_JOYPAD) &&
(id == RETRO_DEVICE_ID_JOYPAD_MASK)) (id == RETRO_DEVICE_ID_JOYPAD_MASK))
{ {