summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-11-28 00:54:29 -0800
committerGitHub <noreply@github.com>2021-11-28 00:54:29 -0800
commitbe56587ad7cd56ef8254d552986c75436396bf30 (patch)
tree077ed5c0ccc3147e6fbf0c154e8ef99cc6ec31ec /src/common
parent564f10527745f870621c08bbb5d16badee0ed861 (diff)
parent51df96b7c0ac7086b26fa766e87e18749e0395b1 (diff)
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.h1
-rw-r--r--src/common/settings_input.h5
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 {
BasicSetting<bool> extended_logging{false, "extended_logging"};
BasicSetting<bool> use_debug_asserts{false, "use_debug_asserts"};
BasicSetting<bool> use_auto_stub{false, "use_auto_stub"};
+ BasicSetting<bool> enable_all_controllers{false, "enable_all_controllers"};
// Miscellaneous
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 {
RightJoycon,
Handheld,
GameCube,
+ Pokeball,
+ NES,
+ SNES,
+ N64,
+ SegaGenesis,
};
struct PlayerInput {