notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #513 from negativeExponent/simplity_multitap_core_option
[pcsx_rearmed.git]
/
libpcsxcore
/
plugins.c
diff --git
a/libpcsxcore/plugins.c
b/libpcsxcore/plugins.c
index
19de72c
..
8d99be2
100644
(file)
--- 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
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
; // 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;
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
//vibration
- if (in_type[port] != PSE_PAD_TYPE_STANDARD)
- vibrate(port);
+ vibrate(port);
break;
}
break;
break;
}
break;