diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-10-16 17:55:45 +0200 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-11-16 05:33:20 +0100 |
commit | d6a41cfc21a75349ca79e73da5ca1dcecd1af901 (patch) | |
tree | c801e3d0927ebfd6665bc8010d6552be0cc2acc4 /src/core | |
parent | hid: Mark Begin/EndPermitVibrationSession as stubs (diff) | |
download | yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar.gz yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar.bz2 yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar.lz yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar.xz yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.tar.zst yuzu-d6a41cfc21a75349ca79e73da5ca1dcecd1af901.zip |
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, const auto& button_state = buttons[npad_index]; return button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay( - vibration_value.amp_low * Settings::values.vibration_strength.GetValue() / 100, - vibration_value.freq_low, - vibration_value.amp_high * Settings::values.vibration_strength.GetValue() / 100, + vibration_value.amp_low, vibration_value.freq_low, vibration_value.amp_high, vibration_value.freq_high); } 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() { values.players.SetGlobal(true); values.use_docked_mode.SetGlobal(true); values.vibration_enabled.SetGlobal(true); - values.vibration_strength.SetGlobal(true); values.motion_enabled.SetGlobal(true); } 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 { Setting<bool> use_docked_mode; Setting<bool> vibration_enabled; - Setting<int> vibration_strength; Setting<bool> motion_enabled; std::string motion_device; |