From e135df2983c02262029ebcd77410fcf5b1c84c69 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 8 Mar 2021 07:42:11 +0100 Subject: [PATCH] Simplify input_state_device - two case statements were identical to an already existing one --- retroarch.c | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/retroarch.c b/retroarch.c index ff5cd0bdde..624037c4d2 100644 --- a/retroarch.c +++ b/retroarch.c @@ -22696,26 +22696,6 @@ static int16_t input_state_device( 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: @@ -22743,26 +22723,6 @@ static int16_t input_state_device( 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: { @@ -22836,6 +22796,8 @@ static int16_t input_state_device( } break; + case RETRO_DEVICE_MOUSE: + case RETRO_DEVICE_LIGHTGUN: case RETRO_DEVICE_POINTER: if (id < RARCH_FIRST_META_KEY) @@ -22847,7 +22809,6 @@ static int16_t input_state_device( { if (button_mask) { - res = 0; if (ret & (1 << id)) res |= (1 << id); }