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

Merge pull request #6605 from spycrab/gc_fix_rumble 

[RFC] Core/GC: Fix rumble for "Luigi's Mansion"
This commit is contained in:
Léo Lam 2018-04-07 23:23:30 +02:00 committed by GitHub
parent 5ed12b45ec eed066e8a7
commit 7dff069659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
View File

@ -309,14 +309,13 @@ void CSIDevice_GCController::SendCommand(u32 command, u8 poll)
case CMD_WRITE: case CMD_WRITE:
{ {
unsigned int type = controller_command.parameter1; // 0 = stop, 1 = rumble, 2 = stop hard unsigned int type = controller_command.parameter1; // 0 = stop, 1 = rumble, 2 = stop hard
unsigned int strength = controller_command.parameter2;
// get the correct pad number that should rumble locally when using netplay // get the correct pad number that should rumble locally when using netplay
const int pad_num = NetPlay_InGamePadToLocalPad(m_device_number); const int pad_num = NetPlay_InGamePadToLocalPad(m_device_number);
if (pad_num < 4) if (pad_num < 4)
{ {
if (type == 1 && strength > 2) if (type == 1)
CSIDevice_GCController::Rumble(pad_num, 1.0); CSIDevice_GCController::Rumble(pad_num, 1.0);
else else
CSIDevice_GCController::Rumble(pad_num, 0.0); CSIDevice_GCController::Rumble(pad_num, 0.0);