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

bitmask won't be possible for keyboard or analog, so get rid

Browse Source 
of it for those switch cases
This commit is contained in:
twinaphex 2019-07-09 00:47:16 +02:00
parent 85b82a8ecf
commit e4a8d2d0b6
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
retroarch.c
View File

@ -3142,21 +3142,12 @@ static int16_t input_state_internal(
&res_overlay, port, device, idx, id);
#endif
{
if (button_mask)
{
res = 0;
if (ret & (1 << id))
res |= (1 << id);
}
else
res = ret;
res = ret;
#ifdef HAVE_OVERLAY
if (input_overlay_is_alive(overlay_ptr) && port == 0)
res |= res_overlay;
if (input_overlay_is_alive(overlay_ptr) && port == 0)
res |= res_overlay;
#endif
}
if (settings->bools.input_remap_binds_enable && input_driver_mapper)
input_mapper_state(input_driver_mapper,
@ -3266,14 +3257,7 @@ static int16_t input_state_internal(
if (!reset_state)
{
if (button_mask)
{
res = 0;
if (ret & (1 << id))
res |= (1 << id);
}
else
res = ret;
res = ret;
#ifdef HAVE_OVERLAY
if (input_overlay_is_alive(overlay_ptr) && port == 0)