aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornegativeExponent2020-10-31 19:38:47 +0800
committernegativeExponent2020-10-31 20:00:27 +0800
commit4c7a462ed37b73f05ff8cc16b477c22e5b2daa26 (patch)
tree254f6f9c49f31b123c3a5ab01979df225a125c27
parent8b9b4c9f8f3d892c657e5a4ad0f799c23cfa735b (diff)
downloadpcsx_rearmed-4c7a462ed37b73f05ff8cc16b477c22e5b2daa26.tar.gz
pcsx_rearmed-4c7a462ed37b73f05ff8cc16b477c22e5b2daa26.tar.bz2
pcsx_rearmed-4c7a462ed37b73f05ff8cc16b477c22e5b2daa26.zip
Fix negcon not working correctly in some games
-rw-r--r--libpcsxcore/plugins.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 19de72c..8d99be2 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -747,7 +747,8 @@ unsigned char _PADpoll(int port, unsigned char value) {
req = value;
// Don't enable Analog/Vibration for a standard pad
- if (in_type[port] == PSE_PAD_TYPE_STANDARD) {
+ if (in_type[port] == PSE_PAD_TYPE_STANDARD ||
+ in_type[port] == PSE_PAD_TYPE_NEGCON) {
; // Pad keystate already in buffer
}
else
@@ -772,9 +773,13 @@ unsigned char _PADpoll(int port, unsigned char value) {
case CMD_READ_DATA_AND_VIBRATE:
//mem the vibration value for Large motor;
pad[port].Vib[1] = value;
+
+ if (in_type[port] == PSE_PAD_TYPE_STANDARD &&
+ in_type[port] == PSE_PAD_TYPE_NEGCON)
+ break;
+
//vibration
- if (in_type[port] != PSE_PAD_TYPE_STANDARD)
- vibrate(port);
+ vibrate(port);
break;
}
break;