diff options
| author | 2020-10-16 11:55:45 -0400 | |
|---|---|---|
| committer | 2020-11-15 23:33:20 -0500 | |
| commit | d6a41cfc21a75349ca79e73da5ca1dcecd1af901 (patch) | |
| tree | c801e3d0927ebfd6665bc8010d6552be0cc2acc4 /src/core | |
| parent | hid: Mark Begin/EndPermitVibrationSession as stubs (diff) | |
| download | yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar.gz yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar.xz yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.zip | |
settings: Remove global vibration strength modifier
This will be replaced in favor of per-player vibration strength modifiers.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 4 | ||||
| -rw-r--r-- | src/core/settings.cpp | 1 | ||||
| -rw-r--r-- | src/core/settings.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 1fc06ef3f..ba20d3f59 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp | |||
| @@ -684,9 +684,7 @@ bool Controller_NPad::VibrateControllerAtIndex(std::size_t npad_index, | |||
| 684 | const auto& button_state = buttons[npad_index]; | 684 | const auto& button_state = buttons[npad_index]; |
| 685 | 685 | ||
| 686 | return button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay( | 686 | return button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay( |
| 687 | vibration_value.amp_low * Settings::values.vibration_strength.GetValue() / 100, | 687 | vibration_value.amp_low, vibration_value.freq_low, vibration_value.amp_high, |
| 688 | vibration_value.freq_low, | ||
| 689 | vibration_value.amp_high * Settings::values.vibration_strength.GetValue() / 100, | ||
| 690 | vibration_value.freq_high); | 688 | vibration_value.freq_high); |
| 691 | } | 689 | } |
| 692 | 690 | ||
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 6e39aebb5..aadbc3932 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -150,7 +150,6 @@ void RestoreGlobalState() { | |||
| 150 | values.players.SetGlobal(true); | 150 | values.players.SetGlobal(true); |
| 151 | values.use_docked_mode.SetGlobal(true); | 151 | values.use_docked_mode.SetGlobal(true); |
| 152 | values.vibration_enabled.SetGlobal(true); | 152 | values.vibration_enabled.SetGlobal(true); |
| 153 | values.vibration_strength.SetGlobal(true); | ||
| 154 | values.motion_enabled.SetGlobal(true); | 153 | values.motion_enabled.SetGlobal(true); |
| 155 | } | 154 | } |
| 156 | 155 | ||
diff --git a/src/core/settings.h b/src/core/settings.h index 496f47747..edd2a00ca 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -170,7 +170,6 @@ struct Values { | |||
| 170 | Setting<bool> use_docked_mode; | 170 | Setting<bool> use_docked_mode; |
| 171 | 171 | ||
| 172 | Setting<bool> vibration_enabled; | 172 | Setting<bool> vibration_enabled; |
| 173 | Setting<int> vibration_strength; | ||
| 174 | 173 | ||
| 175 | Setting<bool> motion_enabled; | 174 | Setting<bool> motion_enabled; |
| 176 | std::string motion_device; | 175 | std::string motion_device; |