mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-11-26 18:05:38 +01:00
core: hid: Fix GC triggers overwritting ZL and ZR buttons
This commit is contained in:
parent
199f77b92f
commit
dc8d42243b
@ -562,6 +562,16 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
|
|||||||
return;
|
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) {
|
switch (index) {
|
||||||
case Settings::NativeButton::A:
|
case Settings::NativeButton::A:
|
||||||
controller.npad_button_state.a.Assign(current_status.value);
|
controller.npad_button_state.a.Assign(current_status.value);
|
||||||
@ -738,6 +748,11 @@ void EmulatedController::SetTrigger(const Common::Input::CallbackStatus& callbac
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only GC controllers have analog triggers
|
||||||
|
if (npad_type != NpadStyleIndex::GameCube) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const auto& trigger = controller.trigger_values[index];
|
const auto& trigger = controller.trigger_values[index];
|
||||||
|
|
||||||
switch (index) {
|
switch (index) {
|
||||||
|
Loading…
Reference in New Issue
Block a user