ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #994 from KrossX/master 

Fix for odd DualShock rumble (Untested)
This commit is contained in:
Gregory Hainaut 2015-12-04 10:01:19 +01:00
parent 74c309b4ff f7a8ec7ee9
commit ab962bf5c6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/LilyPad/LilyPad.cpp
View File

@ -1330,7 +1330,7 @@ u8 CALLBACK PADpoll(u8 value) {
// READ_DATA_AND_VIBRATE // READ_DATA_AND_VIBRATE
case 0x42: case 0x42:
if (query.lastByte == pad->vibrateI[0]) { if (query.lastByte == pad->vibrateI[0]) {
SetVibrate(query.port, query.slot, 1, 255*(0!=value)); SetVibrate(query.port, query.slot, 1, 255*(value&1));
} }
else if (query.lastByte == pad->vibrateI[1]) { else if (query.lastByte == pad->vibrateI[1]) {
SetVibrate(query.port, query.slot, 0, value); SetVibrate(query.port, query.slot, 0, value);

2
plugins/onepad/onepad.cpp
View File

@ -489,7 +489,7 @@ u8 _PADpoll(u8 value)
case CMD_READ_DATA_AND_VIBRATE: case CMD_READ_DATA_AND_VIBRATE:
if (curByte == padVib0[curPad]) if (curByte == padVib0[curPad])
padVibF[curPad][0] = value; padVibF[curPad][0] = value&1;
if (curByte == padVib1[curPad]) if (curByte == padVib1[curPad])
padVibF[curPad][1] = value; padVibF[curPad][1] = value;
break; break;

2
plugins/xpad/xpad.cpp
View File

@ -350,7 +350,7 @@ static class XPadPlugin
switch(index) switch(index)
{ {
case 0: case 0:
m_pad->m_small = value == 1 ? 128 : 0; // RE4 map menu, value = 2 m_pad->m_small = (value&1) * 128;
break; break;
case 1: case 1:
m_pad->m_large = value; m_pad->m_large = value;