ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8653 from jordan-woyak/fix-cc-triggers 

HW/WiimoteEmu: Fix Classic Controller triggers.
This commit is contained in:
Mat M 2020-02-26 17:42:17 -05:00 committed by GitHub
parent 2a18e123a6 ccdfa43a3e
commit 4d9f556456
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp
View File

@ -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;