yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

yuzu/configure_input_simple: Fix "Docked Joycons" controller profile 

This was incorrectly using PlayerIndex 1 when calling the ConfigureDialog.
This commit is contained in:
FearlessTobi 2020-04-05 07:14:35 +02:00
parent 59e75f4372
commit fb8afee077
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/yuzu/configuration/configure_input_simple.cpp
View File

@ -35,6 +35,7 @@ void CallConfigureDialog(ConfigureInputSimple* caller, Args&&... args) {
// - Open any dialogs // - Open any dialogs
// - Block in any way // - Block in any way
constexpr std::size_t PLAYER_0_INDEX = 0;
constexpr std::size_t HANDHELD_INDEX = 8; constexpr std::size_t HANDHELD_INDEX = 8;
void HandheldOnProfileSelect() { void HandheldOnProfileSelect() {
@ -53,8 +54,8 @@ void HandheldOnProfileSelect() {
} }
void DualJoyconsDockedOnProfileSelect() { void DualJoyconsDockedOnProfileSelect() {
Settings::values.players[0].connected = true; Settings::values.players[PLAYER_0_INDEX].connected = true;
Settings::values.players[0].type = Settings::ControllerType::DualJoycon; Settings::values.players[PLAYER_0_INDEX].type = Settings::ControllerType::DualJoycon;
for (std::size_t player = 1; player <= HANDHELD_INDEX; ++player) { for (std::size_t player = 1; player <= HANDHELD_INDEX; ++player) {
Settings::values.players[player].connected = false; Settings::values.players[player].connected = false;
@ -64,7 +65,7 @@ void DualJoyconsDockedOnProfileSelect() {
Settings::values.keyboard_enabled = false; Settings::values.keyboard_enabled = false;
Settings::values.mouse_enabled = false; Settings::values.mouse_enabled = false;
Settings::values.debug_pad_enabled = false; Settings::values.debug_pad_enabled = false;
Settings::values.touchscreen.enabled = false; Settings::values.touchscreen.enabled = true;
} }
// Name, OnProfileSelect (called when selected in drop down), OnConfigure (called when configure // Name, OnProfileSelect (called when selected in drop down), OnConfigure (called when configure
@ -78,7 +79,7 @@ constexpr std::array<InputProfile, 3> INPUT_PROFILES{{
}}, }},
{QT_TR_NOOP("Single Player - Dual Joycons - Docked"), DualJoyconsDockedOnProfileSelect, {QT_TR_NOOP("Single Player - Dual Joycons - Docked"), DualJoyconsDockedOnProfileSelect,
[](ConfigureInputSimple* caller) { [](ConfigureInputSimple* caller) {
CallConfigureDialog<ConfigureInputPlayer>(caller, 1, false); CallConfigureDialog<ConfigureInputPlayer>(caller, PLAYER_0_INDEX, false);
}}, }},
{QT_TR_NOOP("Custom"), [] {}, CallConfigureDialog<ConfigureInput>}, {QT_TR_NOOP("Custom"), [] {}, CallConfigureDialog<ConfigureInput>},
}}; }};