]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
Normal second fire button input event didn't do anything if same port had CD32 pad...
authorToni Wilen <twilen@winuae.net>
Sat, 24 Aug 2019 19:28:17 +0000 (22:28 +0300)
committerToni Wilen <twilen@winuae.net>
Sat, 24 Aug 2019 19:28:17 +0000 (22:28 +0300)
inputdevice.cpp

index a2fc6c8b4dd01a38b3422d416bd8f6f8d1f11c27..673ef267e594286dd3c0f99fd8c95c89041aeb0f 100644 (file)
@@ -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);