summaryrefslogtreecommitdiff
path: root/src/core/hid/emulated_controller.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2021-11-28 00:54:29 -0800
committerGravatar GitHub2021-11-28 00:54:29 -0800
commitbe56587ad7cd56ef8254d552986c75436396bf30 (patch)
tree077ed5c0ccc3147e6fbf0c154e8ef99cc6ec31ec /src/core/hid/emulated_controller.cpp
parentMerge pull request #7255 from german77/kraken (diff)
parentsettings: Add debug setting to enable all controllers (diff)
downloadyuzu-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/core/hid/emulated_controller.cpp')
-rw-r--r--src/core/hid/emulated_controller.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index 06ae41c3e..466ff5542 100644
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -27,6 +27,16 @@ NpadStyleIndex EmulatedController::MapSettingsTypeToNPad(Settings::ControllerTyp
27 return NpadStyleIndex::Handheld; 27 return NpadStyleIndex::Handheld;
28 case Settings::ControllerType::GameCube: 28 case Settings::ControllerType::GameCube:
29 return NpadStyleIndex::GameCube; 29 return NpadStyleIndex::GameCube;
30 case Settings::ControllerType::Pokeball:
31 return NpadStyleIndex::Pokeball;
32 case Settings::ControllerType::NES:
33 return NpadStyleIndex::NES;
34 case Settings::ControllerType::SNES:
35 return NpadStyleIndex::SNES;
36 case Settings::ControllerType::N64:
37 return NpadStyleIndex::N64;
38 case Settings::ControllerType::SegaGenesis:
39 return NpadStyleIndex::SegaGenesis;
30 default: 40 default:
31 return NpadStyleIndex::ProController; 41 return NpadStyleIndex::ProController;
32 } 42 }
@@ -46,6 +56,16 @@ Settings::ControllerType EmulatedController::MapNPadToSettingsType(NpadStyleInde
46 return Settings::ControllerType::Handheld; 56 return Settings::ControllerType::Handheld;
47 case NpadStyleIndex::GameCube: 57 case NpadStyleIndex::GameCube:
48 return Settings::ControllerType::GameCube; 58 return Settings::ControllerType::GameCube;
59 case NpadStyleIndex::Pokeball:
60 return Settings::ControllerType::Pokeball;
61 case NpadStyleIndex::NES:
62 return Settings::ControllerType::NES;
63 case NpadStyleIndex::SNES:
64 return Settings::ControllerType::SNES;
65 case NpadStyleIndex::N64:
66 return Settings::ControllerType::N64;
67 case NpadStyleIndex::SegaGenesis:
68 return Settings::ControllerType::SegaGenesis;
49 default: 69 default:
50 return Settings::ControllerType::ProController; 70 return Settings::ControllerType::ProController;
51 } 71 }