diff options
| author | JosJuice <josjuice@gmail.com> | 2015-09-12 22:45:06 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2015-09-12 22:45:06 +0200 |
| commit | cbd539eb3d34b6be3df54ea414b77130cc225b3c (patch) | |
| tree | 6fb87b13e1e090dca085495343cb37c91a5e86ec /Source/Core/InputCommon/ControllerEmu.cpp | |
| parent | c0a89c3bf4dfe5b45989df2ea5e804009b615f16 (diff) | |
Use official names for GameCube controller sticks
Main Stick is changed to Control Stick and C-Stick is changed to C Stick.
A new ui_name variable is added to ControlGroup so that the UI strings
in DolphinWX can be updated without breaking backwards compatibility
with config INIs and other things that use names as IDs.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index f1d33c65c3..a95da19100 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -143,7 +143,11 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base) } ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius) - : ControlGroup(_name, GROUP_TYPE_STICK) + : AnalogStick(_name, _name, GROUP_TYPE_STICK) +{} + +ControllerEmu::AnalogStick::AnalogStick(const char* const _name, const char* const _ui_name, ControlState default_radius) + : ControlGroup(_name, _ui_name, GROUP_TYPE_STICK) { for (auto& named_direction : named_directions) controls.emplace_back(new Input(named_direction)); |