summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2017-02-23 13:13:43 -0800
committerGitHub <noreply@github.com>2017-02-23 13:13:43 -0800
commite9850382e3d5d4669aaf7a58d7660f6290a0d291 (patch)
tree3422721479745a26f7ecd995f14f46f106eb057c /Source/Core/InputCommon/ControllerEmu/ControlGroup
parentfb8369d0e0a567032c6c21a93d7155ef0c7c6b73 (diff)
parentf5c82adc595612c580db0376b6e7ea5ad4ce7b26 (diff)
Merge pull request #4930 from JosJuice/sideways-wiimote-name
Change INI keys containing "Wii Remote" back to "Wiimote"
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h
index 68eacb6e02..d1870f7f03 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h
@@ -64,9 +64,15 @@ public:
class BooleanSetting
{
public:
+ BooleanSetting(const std::string& setting_name, const std::string& ui_name,
+ const bool default_value, const SettingType setting_type = SettingType::NORMAL)
+ : m_type(setting_type), m_name(setting_name), m_ui_name(ui_name),
+ m_default_value(default_value)
+ {
+ }
BooleanSetting(const std::string& setting_name, const bool default_value,
const SettingType setting_type = SettingType::NORMAL)
- : m_type(setting_type), m_name(setting_name), m_default_value(default_value)
+ : BooleanSetting(setting_name, setting_name, default_value, setting_type)
{
}
virtual ~BooleanSetting();
@@ -75,6 +81,7 @@ public:
virtual void SetValue(bool value) { m_value = value; }
const SettingType m_type;
const std::string m_name;
+ const std::string m_ui_name;
const bool m_default_value;
bool m_value;
};