2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00

Merge pull request #11854 from german77/vibration-ui

yuzu: Fix vibration reseting to 1%
This commit is contained in:
liamwhite 2023-10-23 10:33:03 -04:00 committed by GitHub
commit 6b93b0b08c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -89,7 +89,7 @@ void ConfigureVibration::VibrateController(Core::HID::ControllerTriggerType type
auto& player = Settings::values.players.GetValue()[player_index]; auto& player = Settings::values.players.GetValue()[player_index];
auto controller = hid_core.GetEmulatedControllerByIndex(player_index); auto controller = hid_core.GetEmulatedControllerByIndex(player_index);
const int vibration_strenght = vibration_spinboxes[player_index]->value(); const int vibration_strength = vibration_spinboxes[player_index]->value();
const auto& buttons = controller->GetButtonsValues(); const auto& buttons = controller->GetButtonsValues();
bool button_is_pressed = false; bool button_is_pressed = false;
@ -105,10 +105,10 @@ void ConfigureVibration::VibrateController(Core::HID::ControllerTriggerType type
return; return;
} }
const int old_vibration_enabled = player.vibration_enabled; const bool old_vibration_enabled = player.vibration_enabled;
const bool old_vibration_strenght = player.vibration_strength; const int old_vibration_strength = player.vibration_strength;
player.vibration_enabled = true; player.vibration_enabled = true;
player.vibration_strength = vibration_strenght; player.vibration_strength = vibration_strength;
const Core::HID::VibrationValue vibration{ const Core::HID::VibrationValue vibration{
.low_amplitude = 1.0f, .low_amplitude = 1.0f,
@ -121,7 +121,7 @@ void ConfigureVibration::VibrateController(Core::HID::ControllerTriggerType type
// Restore previous values // Restore previous values
player.vibration_enabled = old_vibration_enabled; player.vibration_enabled = old_vibration_enabled;
player.vibration_strength = old_vibration_strenght; player.vibration_strength = old_vibration_strength;
} }
void ConfigureVibration::StopVibrations() { void ConfigureVibration::StopVibrations() {