diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2020-02-26 15:40:58 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2020-02-26 15:40:58 -0600 |
| commit | ccdfa43a3e48557e7ea2f4d92129aaaf2da9890d (patch) | |
| tree | 9ae8a180007b919e6720fbb1b536bb503382048f /Source | |
| parent | 2a18e123a6147078ef1d71ea8438588882049893 (diff) | |
HW/WiimoteEmu: Fix Classic Controller triggers.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp index 761950a24e..252723e376 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp @@ -130,10 +130,12 @@ void Classic::Update() classic_data.SetRightStick({x, y}); } + u16 buttons = 0; + // triggers { ControlState trigs[2] = {0, 0}; - m_triggers->GetState(&classic_data.bt.hex, classic_trigger_bitmasks.data(), trigs); + m_triggers->GetState(&buttons, classic_trigger_bitmasks.data(), trigs); const u8 lt = static_cast<u8>(trigs[0] * TRIGGER_RANGE); const u8 rt = static_cast<u8>(trigs[1] * TRIGGER_RANGE); @@ -143,9 +145,9 @@ void Classic::Update() } // buttons and dpad - u16 buttons = 0; m_buttons->GetState(&buttons, classic_button_bitmasks.data()); m_dpad->GetState(&buttons, classic_dpad_bitmasks.data()); + classic_data.SetButtons(buttons); Common::BitCastPtr<DataFormat>(&m_reg.controller_data) = classic_data; |
