diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-21 17:38:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 17:38:03 +0200 |
| commit | 528727d3d98f8cda714f6649504c416b1fa34a96 (patch) | |
| tree | 2f520367b6c9a7bedcc97c666cfeceaf4ee5c5e4 /core/os/input.cpp | |
| parent | 91ee2f60591d0b47d5eca8783ffbd15caa9c4665 (diff) | |
| parent | 6d09183c44e6db0ca1896f50f8727e55716dd85c (diff) | |
Merge pull request #5340 from Hinsbart/rumble_duration
Set default duration parameter of joystick vibration to 0.
Diffstat (limited to 'core/os/input.cpp')
| -rw-r--r-- | core/os/input.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp index 005a248aac..dacddc0928 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -61,7 +61,7 @@ void Input::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_joy_guid","device"),&Input::get_joy_guid); ObjectTypeDB::bind_method(_MD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength); ObjectTypeDB::bind_method(_MD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration); - ObjectTypeDB::bind_method(_MD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration); + ObjectTypeDB::bind_method(_MD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration, DEFVAL(0)); ObjectTypeDB::bind_method(_MD("stop_joy_vibration", "device"), &Input::stop_joy_vibration); ObjectTypeDB::bind_method(_MD("get_accelerometer"),&Input::get_accelerometer); ObjectTypeDB::bind_method(_MD("get_magnetometer"),&Input::get_magnetometer); |