From 66dcff778eb650dd16223c021cbf9a466bcbb07e Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 24 Aug 2019 22:28:17 +0300 Subject: [PATCH] Normal second fire button input event didn't do anything if same port had CD32 pad in CD32 mode. --- inputdevice.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inputdevice.cpp b/inputdevice.cpp index a2fc6c8b..673ef267 100644 --- a/inputdevice.cpp +++ b/inputdevice.cpp @@ -3579,6 +3579,10 @@ static uae_u16 handle_joystick_potgor (uae_u16 potgor) if (cd32_shifter[i] >= 2 && (joybutton[i] & ((1 << JOYBUTTON_CD32_PLAY) << (cd32_shifter[i] - 2)))) potgor &= ~p9dat; + // normal second button pressed: always zero. Overrides CD32 mode. + if (getbuttonstate(i, JOYBUTTON_2)) + potgor &= ~p9dat; + } else if (alg_flag) { potgor = alg_potgor(potgo_value); -- 2.47.3