summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-04-02 16:03:11 +0200
committergerman77 <juangerman-13@hotmail.com>2021-04-02 16:03:11 +0200
commiteaf0c4af11c24a6b99979c77ae7a75c54925f4ff (patch)
treedeb1fdfdfec83d28677c3be0cb78b782b8841fcb
parentMerge pull request #6101 from ogniK5377/alloc-as-ex (diff)
downloadyuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar
yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar.gz
yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar.bz2
yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar.lz
yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar.xz
yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.tar.zst
yuzu-eaf0c4af11c24a6b99979c77ae7a75c54925f4ff.zip
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp8
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) {
lstick_entry.y = static_cast<s32>(stick_l_y_f * HID_JOYSTICK_MAX);
}
- if (controller_type == NPadControllerType::JoyLeft ||
- controller_type == NPadControllerType::JoyRight) {
+ if (controller_type == NPadControllerType::JoyLeft) {
pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus());
pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus());
}
+ if (controller_type == NPadControllerType::JoyRight) {
+ pad_state.right_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus());
+ pad_state.right_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus());
+ }
+
if (controller_type == NPadControllerType::GameCube) {
trigger_entry.l_analog = static_cast<s32>(
button_state[ZL - BUTTON_HID_BEGIN]->GetStatus() ? HID_TRIGGER_MAX : 0);