Browse Source

Merge pull request #8863 from german77/triggers

core: hid: Fix GC triggers overwriting ZL and ZR buttons
nce_cpp
bunnei 3 years ago
committed by GitHub
parent
commit
44ce3eaf4c
  1. 15
      src/core/hid/emulated_controller.cpp

15
src/core/hid/emulated_controller.cpp

@ -562,6 +562,16 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
return;
}
// GC controllers have triggers not buttons
if (npad_type == NpadStyleIndex::GameCube) {
if (index == Settings::NativeButton::ZR) {
return;
}
if (index == Settings::NativeButton::ZL) {
return;
}
}
switch (index) {
case Settings::NativeButton::A:
controller.npad_button_state.a.Assign(current_status.value);
@ -738,6 +748,11 @@ void EmulatedController::SetTrigger(const Common::Input::CallbackStatus& callbac
return;
}
// Only GC controllers have analog triggers
if (npad_type != NpadStyleIndex::GameCube) {
return;
}
const auto& trigger = controller.trigger_values[index];
switch (index) {

Loading…
Cancel
Save