INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-11 01:58:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

settings: Fix Debug controller type options

Browse Source
This commit is contained in:
german77
2021-10-31 10:41:44 -05:00
committed by Narr the Reg
parent 2b1b0c2a30
commit 730f078302
13 changed files with 77 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hid/emulated_controller.cpp
View File

@ -77,7 +77,12 @@ void EmulatedController::ReloadFromSettings() {
controller.colors_state.fullkey = controller.colors_state.left;
SetNpadType(MapSettingsTypeToNPad(player.controller_type));
// Other or debug controller should always be a pro controller
if (npad_id_type != NpadIdType::Other) {
SetNpadType(MapSettingsTypeToNPad(player.controller_type));
} else {
SetNpadType(NpadType::ProController);
}
if (player.connected) {
Connect();
@ -606,12 +611,12 @@ void EmulatedController::SetTrigger(Common::Input::CallbackStatus callback, std:
switch (index) {
case Settings::NativeTrigger::LTrigger:
controller.gc_trigger_state.left = static_cast<s32>(trigger.analog.value * HID_TRIGGER_MAX);
controller.npad_button_state.zl.Assign(trigger.pressed);
controller.npad_button_state.zl.Assign(trigger.pressed.value);
break;
case Settings::NativeTrigger::RTrigger:
controller.gc_trigger_state.right =
static_cast<s32>(trigger.analog.value * HID_TRIGGER_MAX);
controller.npad_button_state.zr.Assign(trigger.pressed);
controller.npad_button_state.zr.Assign(trigger.pressed.value);
break;
}