diff options
| author |  german77 | 2021-04-02 09:03:11 -0500 |
|---|---|---|
| committer | german77 | 2021-04-02 09:03:11 -0500 |
| commit | eaf0c4af11c24a6b99979c77ae7a75c54925f4ff (patch) | |
| tree | deb1fdfdfec83d28677c3be0cb78b782b8841fcb /src | |
| parent | Merge pull request #6101 from ogniK5377/alloc-as-ex (diff) | |
| download | yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar.gz yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar.xz yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.zip | |
HID: Fix SL and SR buttons for right joycon
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 70b9f3824..1df62f98e 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp | |||
| @@ -413,12 +413,16 @@ void Controller_NPad::RequestPadStateUpdate(u32 npad_id) { | |||
| 413 | lstick_entry.y = static_cast<s32>(stick_l_y_f * HID_JOYSTICK_MAX); | 413 | lstick_entry.y = static_cast<s32>(stick_l_y_f * HID_JOYSTICK_MAX); |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | if (controller_type == NPadControllerType::JoyLeft || | 416 | if (controller_type == NPadControllerType::JoyLeft) { |
| 417 | controller_type == NPadControllerType::JoyRight) { | ||
| 418 | pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus()); | 417 | pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus()); |
| 419 | pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus()); | 418 | pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus()); |
| 420 | } | 419 | } |
| 421 | 420 | ||
| 421 | if (controller_type == NPadControllerType::JoyRight) { | ||
| 422 | pad_state.right_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus()); | ||
| 423 | pad_state.right_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus()); | ||
| 424 | } | ||
| 425 | |||
| 422 | if (controller_type == NPadControllerType::GameCube) { | 426 | if (controller_type == NPadControllerType::GameCube) { |
| 423 | trigger_entry.l_analog = static_cast<s32>( | 427 | trigger_entry.l_analog = static_cast<s32>( |
| 424 | button_state[ZL - BUTTON_HID_BEGIN]->GetStatus() ? HID_TRIGGER_MAX : 0); | 428 | button_state[ZL - BUTTON_HID_BEGIN]->GetStatus() ? HID_TRIGGER_MAX : 0); |