diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-19 12:59:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 12:59:18 +0200 |
| commit | 57e1387199c96473007bfa2d430e8cf6cedfc5ff (patch) | |
| tree | 29a2c9f1bb746f62e59b3faf6ca345abe33788f6 /main | |
| parent | f70aa176e5b84c3029078ceb4941fd6234ff7680 (diff) | |
| parent | 0e8b8600488971e5d452ad681bb41153ed8d34ad (diff) | |
Merge pull request #5225 from Hinsbart/x_rumble
Windows: Support gamepad vibration using XInput.
Diffstat (limited to 'main')
| -rw-r--r-- | main/input_default.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index ebf5763a6c..a70b66838a 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -355,7 +355,7 @@ void InputDefault::start_joy_vibration(int p_device, float p_weak_magnitude, flo vibration.weak_magnitude = p_weak_magnitude; vibration.strong_magnitude = p_strong_magnitude; vibration.duration = p_duration; - vibration.timestamp = OS::get_singleton()->get_unix_time(); + vibration.timestamp = OS::get_singleton()->get_ticks_usec(); joy_vibration[p_device] = vibration; } |