From cbd539eb3d34b6be3df54ea414b77130cc225b3c Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 12 Sep 2015 22:45:06 +0200 Subject: 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. --- Source/Core/InputCommon/ControllerEmu.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerEmu.cpp') 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)); -- cgit v1.2.3