diff options
| author | LC <mathew1800@gmail.com> | 2020-07-12 12:38:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-12 12:38:49 -0400 |
| commit | ecc6af7f7f2dd91fd3318ff25c9d50d70176be2e (patch) | |
| tree | a897c1f1e75c4d61e64dc2f2ebcb73caa2798bd3 /Source/Core/InputCommon/ControllerEmu/ControlGroup | |
| parent | ed32a2a1fe1d63f3ac1d9380b2328ebff39668e8 (diff) | |
| parent | d9e7d0514c9cbe161ba93401f40ea20e5e701da3 (diff) | |
Merge pull request #8948 from jordan-woyak/speaker-data-writes
WiimoteEmu: Allow writes of the i2c bus to play speaker data.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h index 8f98401dcd..46b8172d14 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h @@ -75,11 +75,11 @@ public: template <typename T> void AddSetting(SettingValue<T>* value, const NumericSettingDetails& details, - std::common_type_t<T> default_value, std::common_type_t<T> min_value = {}, + std::common_type_t<T> default_value_, std::common_type_t<T> min_value = {}, std::common_type_t<T> max_value = T(100)) { numeric_settings.emplace_back( - std::make_unique<NumericSetting<T>>(value, details, default_value, min_value, max_value)); + std::make_unique<NumericSetting<T>>(value, details, default_value_, min_value, max_value)); } void AddDeadzoneSetting(SettingValue<double>* value, double maximum_deadzone); |
