mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify input_state_device - two case statements were identical

Browse Source 
to an already existing one
This commit is contained in:
twinaphex 2021-03-08 07:42:11 +01:00
parent bb6029d24f
commit e135df2983
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
retroarch.c
View File

@ -22696,26 +22696,6 @@ static int16_t input_state_device(
break; break;
case RETRO_DEVICE_MOUSE:
if (id < RARCH_FIRST_META_KEY)
{
bool bind_valid = p_rarch->libretro_input_binds[port]
&& p_rarch->libretro_input_binds[port][id].valid;
if (bind_valid)
{
if (button_mask)
{
if (ret & (1 << id))
res |= (1 << id);
}
else
res = ret;
}
}
break;
case RETRO_DEVICE_KEYBOARD: case RETRO_DEVICE_KEYBOARD:
@ -22743,26 +22723,6 @@ static int16_t input_state_device(
break; break;
case RETRO_DEVICE_LIGHTGUN:
if (id < RARCH_FIRST_META_KEY)
{
bool bind_valid = p_rarch->libretro_input_binds[port]
&& p_rarch->libretro_input_binds[port][id].valid;
if (bind_valid)
{
if (button_mask)
{
if (ret & (1 << id))
res |= (1 << id);
}
else
res = ret;
}
}
break;
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
{ {
@ -22836,6 +22796,8 @@ static int16_t input_state_device(
} }
break; break;
case RETRO_DEVICE_MOUSE:
case RETRO_DEVICE_LIGHTGUN:
case RETRO_DEVICE_POINTER: case RETRO_DEVICE_POINTER:
if (id < RARCH_FIRST_META_KEY) if (id < RARCH_FIRST_META_KEY)
@ -22847,7 +22809,6 @@ static int16_t input_state_device(
{ {
if (button_mask) if (button_mask)
{ {
res = 0;
if (ret & (1 << id)) if (ret & (1 << id))
res |= (1 << id); res |= (1 << id);
} }