From: Toni Wilen <twilen@winuae.net>
Date: Sat, 24 Aug 2019 19:28:17 +0000 (+0300)
Subject: Normal second fire button input event didn't do anything if same port had CD32 pad... 
X-Git-Tag: 4300~135
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=66dcff778eb650dd16223c021cbf9a466bcbb07e;p=francis%2Fwinuae.git

Normal second fire button input event didn't do anything if same port had CD32 pad in CD32 mode.
---

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);