diff options
author | Autechre | 2020-10-31 23:59:27 +0100 |
---|---|---|
committer | GitHub | 2020-10-31 23:59:27 +0100 |
commit | a5e7ffa71b24529cc1d63f0bb85454c78dc112c8 (patch) | |
tree | 254f6f9c49f31b123c3a5ab01979df225a125c27 /libpcsxcore | |
parent | 2ead2fb6d618305ca48e50e1982bb7e01bf45237 (diff) | |
parent | 4c7a462ed37b73f05ff8cc16b477c22e5b2daa26 (diff) | |
download | pcsx_rearmed-a5e7ffa71b24529cc1d63f0bb85454c78dc112c8.tar.gz pcsx_rearmed-a5e7ffa71b24529cc1d63f0bb85454c78dc112c8.tar.bz2 pcsx_rearmed-a5e7ffa71b24529cc1d63f0bb85454c78dc112c8.zip |
Merge pull request #470 from negativeExponent/pads
remove dfinput, fix negcon input
Diffstat (limited to 'libpcsxcore')
-rw-r--r-- | libpcsxcore/plugins.c | 11 |
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; |