diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2022-10-25 18:13:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-25 18:13:18 +0200 |
commit | 77803d96be3f6ec590b63966359b8f5fa56013db (patch) | |
tree | 1c6b80a6ee305d457319ccacd71de333eaaf43f9 /src/core/hle/service/hid/controllers/npad.cpp | |
parent | Merge pull request #9112 from vonchenplus/deferred_draw (diff) | |
parent | input_common: cache vibration tests (diff) | |
download | yuzu-77803d96be3f6ec590b63966359b8f5fa56013db.tar yuzu-77803d96be3f6ec590b63966359b8f5fa56013db.tar.gz yuzu-77803d96be3f6ec590b63966359b8f5fa56013db.tar.bz2 yuzu-77803d96be3f6ec590b63966359b8f5fa56013db.tar.lz yuzu-77803d96be3f6ec590b63966359b8f5fa56013db.tar.xz yuzu-77803d96be3f6ec590b63966359b8f5fa56013db.tar.zst yuzu-77803d96be3f6ec590b63966359b8f5fa56013db.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.cpp')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 3b26e96de..2f871de31 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -868,7 +868,7 @@ bool Controller_NPad::VibrateControllerAtIndex(Core::HID::NpadIdType npad_id, return false; } - if (!controller.device->IsVibrationEnabled()) { + if (!controller.device->IsVibrationEnabled(device_index)) { if (controller.vibration[device_index].latest_vibration_value.low_amplitude != 0.0f || controller.vibration[device_index].latest_vibration_value.high_amplitude != 0.0f) { // Send an empty vibration to stop any vibrations. @@ -1001,7 +1001,7 @@ void Controller_NPad::InitializeVibrationDeviceAtIndex(Core::HID::NpadIdType npa } controller.vibration[device_index].device_mounted = - controller.device->TestVibration(device_index); + controller.device->IsVibrationEnabled(device_index); } void Controller_NPad::SetPermitVibrationSession(bool permit_vibration_session) { |