diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-10 18:24:55 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-10 18:24:55 -0300 |
| commit | a120c66f98586138fc61fa6f243cb071d60111bc (patch) | |
| tree | 61deb7f8b8443bee3e028ad9ae347496eea4e458 /core/os | |
| parent | 5b088b41b3147cc19f2d5bc56b762bd5988bc484 (diff) | |
-Removed OS.get_system_time_msec(), this is undoable on Windows and also unusable from GDscript due to precision.
-Added, instead an OS.get_system_time_secs(), which is 32 bits friendly, fixes #3143
Diffstat (limited to 'core/os')
| -rw-r--r-- | core/os/os.cpp | 2 | ||||
| -rw-r--r-- | core/os/os.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index eb5f91167a..1a505fb236 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -50,7 +50,7 @@ uint64_t OS::get_unix_time() const { return 0; }; -uint64_t OS::get_system_time_msec() const { +uint64_t OS::get_system_time_secs() const { return 0; } void OS::debug_break() { diff --git a/core/os/os.h b/core/os/os.h index 94cb1d4ea4..711743f23a 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -256,7 +256,7 @@ public: virtual Time get_time(bool local=false) const=0; virtual TimeZoneInfo get_time_zone_info() const=0; virtual uint64_t get_unix_time() const; - virtual uint64_t get_system_time_msec() const; + virtual uint64_t get_system_time_secs() const; virtual void delay_usec(uint32_t p_usec) const=0; virtual uint64_t get_ticks_usec() const=0; |