ShuriZma
/
suyu
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

controllers/npad: Stop games from vibrating incorrect controllers 

Fixes vibration in 1-2 Switch and potentially other games where they would vibrate both players' joycons at the same time.
This commit is contained in:
Morph 2020-10-08 08:18:50 -04:00
parent 07b81f57ba
commit e02ef3c3be
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -688,6 +688,16 @@ void Controller_NPad::VibrateController(const std::vector<DeviceHandle>& vibrati
continue; continue;
} }
// Some games try to send mismatched parameters in the device handle, block these.
if ((connected_controllers[npad_index].type == NPadControllerType::JoyLeft &&
(vibration_device_handles[i].npad_type == NpadType::JoyconRight ||
vibration_device_handles[i].device_index == DeviceIndex::Right)) ||
(connected_controllers[npad_index].type == NPadControllerType::JoyRight &&
(vibration_device_handles[i].npad_type == NpadType::JoyconLeft ||
vibration_device_handles[i].device_index == DeviceIndex::Left))) {
continue;
}
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
const auto& button_state = buttons[npad_index]; const auto& button_state = buttons[npad_index];