diff options
| author | 2023-11-16 09:13:39 -0500 | |
|---|---|---|
| committer | 2023-11-16 09:13:39 -0500 | |
| commit | ea4c92f734fdcb26d20d1313a84d39cc95c9c575 (patch) | |
| tree | c2bec0a6007751afd01fe624a003026ab9831bd1 /src/core/hle | |
| parent | Merge pull request #12043 from t895/disable-pip-default (diff) | |
| parent | core: hid: Split SL and SR buttons (diff) | |
| download | yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.gz yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.xz yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.zip | |
Merge pull request #12007 from german77/moar_buttons
core: hid: Split SL and SR buttons
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 21695bda2..d46bf917e 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp | |||
| @@ -457,12 +457,14 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) { | |||
| 457 | pad_entry.l_stick = stick_state.left; | 457 | pad_entry.l_stick = stick_state.left; |
| 458 | } | 458 | } |
| 459 | 459 | ||
| 460 | if (controller_type == Core::HID::NpadStyleIndex::JoyconLeft) { | 460 | if (controller_type == Core::HID::NpadStyleIndex::JoyconLeft || |
| 461 | controller_type == Core::HID::NpadStyleIndex::JoyconDual) { | ||
| 461 | pad_entry.npad_buttons.left_sl.Assign(button_state.left_sl); | 462 | pad_entry.npad_buttons.left_sl.Assign(button_state.left_sl); |
| 462 | pad_entry.npad_buttons.left_sr.Assign(button_state.left_sr); | 463 | pad_entry.npad_buttons.left_sr.Assign(button_state.left_sr); |
| 463 | } | 464 | } |
| 464 | 465 | ||
| 465 | if (controller_type == Core::HID::NpadStyleIndex::JoyconRight) { | 466 | if (controller_type == Core::HID::NpadStyleIndex::JoyconRight || |
| 467 | controller_type == Core::HID::NpadStyleIndex::JoyconDual) { | ||
| 466 | pad_entry.npad_buttons.right_sl.Assign(button_state.right_sl); | 468 | pad_entry.npad_buttons.right_sl.Assign(button_state.right_sl); |
| 467 | pad_entry.npad_buttons.right_sr.Assign(button_state.right_sr); | 469 | pad_entry.npad_buttons.right_sr.Assign(button_state.right_sr); |
| 468 | } | 470 | } |