diff options
| author | bunnei <bunneidev@gmail.com> | 2022-01-11 10:49:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-11 10:49:23 -0800 |
| commit | 5d1080d2a86c030721e4fe5bdc695e0e2bdbe1dc (patch) | |
| tree | 9790b6abe3e9d05649629fe851031438ed6ad139 /src/input_common/drivers/tas_input.cpp | |
| parent | 4b8518f4ced30857ea72fc3b075c0c1953a0c612 (diff) | |
| parent | 353317f31ec4cd7218c30a444486d6ded74336b3 (diff) | |
Merge pull request #7633 from german77/hotkeys
yuzu: Add controller hotkeys
Diffstat (limited to 'src/input_common/drivers/tas_input.cpp')
| -rw-r--r-- | src/input_common/drivers/tas_input.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input_common/drivers/tas_input.cpp b/src/input_common/drivers/tas_input.cpp index d78228b50b..944e141bfe 100644 --- a/src/input_common/drivers/tas_input.cpp +++ b/src/input_common/drivers/tas_input.cpp @@ -23,7 +23,7 @@ enum class Tas::TasAxis : u8 { }; // Supported keywords and buttons from a TAS file -constexpr std::array<std::pair<std::string_view, TasButton>, 20> text_to_tas_button = { +constexpr std::array<std::pair<std::string_view, TasButton>, 18> text_to_tas_button = { std::pair{"KEY_A", TasButton::BUTTON_A}, {"KEY_B", TasButton::BUTTON_B}, {"KEY_X", TasButton::BUTTON_X}, @@ -40,8 +40,9 @@ constexpr std::array<std::pair<std::string_view, TasButton>, 20> text_to_tas_but {"KEY_DDOWN", TasButton::BUTTON_DOWN}, {"KEY_SL", TasButton::BUTTON_SL}, {"KEY_SR", TasButton::BUTTON_SR}, - {"KEY_CAPTURE", TasButton::BUTTON_CAPTURE}, - {"KEY_HOME", TasButton::BUTTON_HOME}, + // These buttons are disabled to avoid TAS input from activating hotkeys + // {"KEY_CAPTURE", TasButton::BUTTON_CAPTURE}, + // {"KEY_HOME", TasButton::BUTTON_HOME}, {"KEY_ZL", TasButton::TRIGGER_ZL}, {"KEY_ZR", TasButton::TRIGGER_ZR}, }; |