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

Revert "Simplify input_state_device:" 

This reverts commit 0b9bc85ddd.
This commit is contained in:
twinaphex 2021-04-06 14:25:58 +02:00
parent 5c6cd1b48a
commit d11c7cbbb1
1 changed files with 271 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
retroarch.c
View File

@ -22302,14 +22302,10 @@ static int16_t input_state_device(
unsigned idx, unsigned id, unsigned idx, unsigned id,
bool button_mask) bool button_mask)
{ {
unsigned i;
int16_t res = 0; int16_t res = 0;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
input_mapper_t *handle = &p_rarch->input_driver_mapper; input_mapper_t *handle = &p_rarch->input_driver_mapper;
unsigned iterations = button_mask ? RARCH_FIRST_CUSTOM_BIND : 1;
for (i = 0; i < iterations; i++, id++)
{
switch (device) switch (device)
{ {
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
@ -22591,8 +22587,6 @@ static int16_t input_state_device(
break; break;
} }
}
return res; return res;
} }
@ -22706,11 +22700,16 @@ static int16_t input_state(unsigned port, unsigned device,
if ( (p_rarch->input_driver_flushing_input == 0) if ( (p_rarch->input_driver_flushing_input == 0)
&& !p_rarch->input_driver_block_libretro_input) && !p_rarch->input_driver_block_libretro_input)
{ {
bool button_mask = (device == RETRO_DEVICE_JOYPAD) && if ( (device == RETRO_DEVICE_JOYPAD) &&
(id == RETRO_DEVICE_ID_JOYPAD_MASK); (id == RETRO_DEVICE_ID_JOYPAD_MASK))
{
result = input_state_device(p_rarch, ret, port, device, idx, unsigned i;
button_mask ? 0 : id, button_mask); for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
if (input_state_device(p_rarch, ret, port, device, idx, i, true))
result |= (1 << i);
}
else
result = input_state_device(p_rarch, ret, port, device, idx, id, false);
} }
#ifdef HAVE_BSV_MOVIE #ifdef HAVE_BSV_MOVIE