diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-19 15:14:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-19 15:14:36 +0100 |
commit | efddb8a0cbf2656100bbde6539739e18f259740d (patch) | |
tree | a1d074a9634bff91fdefaf324ec7661749b47ccf /core/core_bind.cpp | |
parent | bc395c2549009d28cdb8884f4beeebe7250de9f5 (diff) | |
parent | 76f1f9b3c56afff2aa144468d8e33f590d6822cd (diff) | |
download | redot-engine-efddb8a0cbf2656100bbde6539739e18f259740d.tar.gz |
Merge pull request #46194 from Calinou/os-delay-no-negative
Don't allow negative values for `OS.delay_usec()`/`OS.delay_msec()`
Diffstat (limited to 'core/core_bind.cpp')
-rw-r--r-- | core/core_bind.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/core_bind.cpp b/core/core_bind.cpp index 8a6d048909..0da6680a7b 100644 --- a/core/core_bind.cpp +++ b/core/core_bind.cpp @@ -519,11 +519,19 @@ double _OS::get_unix_time() const { return OS::get_singleton()->get_unix_time(); } -void _OS::delay_usec(uint32_t p_usec) const { +/** This method uses a signed argument for better error reporting as it's used from the scripting API. */ +void _OS::delay_usec(int p_usec) const { + ERR_FAIL_COND_MSG( + p_usec < 0, + vformat("Can't sleep for %d microseconds. The delay provided must be greater than or equal to 0 microseconds.", p_usec)); OS::get_singleton()->delay_usec(p_usec); } -void _OS::delay_msec(uint32_t p_msec) const { +/** This method uses a signed argument for better error reporting as it's used from the scripting API. */ +void _OS::delay_msec(int p_msec) const { + ERR_FAIL_COND_MSG( + p_msec < 0, + vformat("Can't sleep for %d milliseconds. The delay provided must be greater than or equal to 0 milliseconds.", p_msec)); OS::get_singleton()->delay_usec(int64_t(p_msec) * 1000); } |