diff options
| author | 2021-11-28 00:54:29 -0800 | |
|---|---|---|
| committer | 2021-11-28 00:54:29 -0800 | |
| commit | be56587ad7cd56ef8254d552986c75436396bf30 (patch) | |
| tree | 077ed5c0ccc3147e6fbf0c154e8ef99cc6ec31ec /src/common | |
| parent | Merge pull request #7255 from german77/kraken (diff) | |
| parent | settings: Add debug setting to enable all controllers (diff) | |
| download | yuzu-be56587ad7cd56ef8254d552986c75436396bf30.tar.gz yuzu-be56587ad7cd56ef8254d552986c75436396bf30.tar.xz yuzu-be56587ad7cd56ef8254d552986c75436396bf30.zip | |
Merge pull request #7451 from german77/debug_controller
settings: Add debug setting to enable all controllers
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.h | 1 | ||||
| -rw-r--r-- | src/common/settings_input.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/common/settings.h b/src/common/settings.h index e4e049f67..313f1fa7f 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -604,6 +604,7 @@ struct Values { | |||
| 604 | BasicSetting<bool> extended_logging{false, "extended_logging"}; | 604 | BasicSetting<bool> extended_logging{false, "extended_logging"}; |
| 605 | BasicSetting<bool> use_debug_asserts{false, "use_debug_asserts"}; | 605 | BasicSetting<bool> use_debug_asserts{false, "use_debug_asserts"}; |
| 606 | BasicSetting<bool> use_auto_stub{false, "use_auto_stub"}; | 606 | BasicSetting<bool> use_auto_stub{false, "use_auto_stub"}; |
| 607 | BasicSetting<bool> enable_all_controllers{false, "enable_all_controllers"}; | ||
| 607 | 608 | ||
| 608 | // Miscellaneous | 609 | // Miscellaneous |
| 609 | BasicSetting<std::string> log_filter{"*:Info", "log_filter"}; | 610 | BasicSetting<std::string> log_filter{"*:Info", "log_filter"}; |
diff --git a/src/common/settings_input.h b/src/common/settings_input.h index 9e3df7376..4ff37e186 100644 --- a/src/common/settings_input.h +++ b/src/common/settings_input.h | |||
| @@ -370,6 +370,11 @@ enum class ControllerType { | |||
| 370 | RightJoycon, | 370 | RightJoycon, |
| 371 | Handheld, | 371 | Handheld, |
| 372 | GameCube, | 372 | GameCube, |
| 373 | Pokeball, | ||
| 374 | NES, | ||
| 375 | SNES, | ||
| 376 | N64, | ||
| 377 | SegaGenesis, | ||
| 373 | }; | 378 | }; |
| 374 | 379 | ||
| 375 | struct PlayerInput { | 380 | struct PlayerInput { |