summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMax Hilbrunner <m.hilbrunner@gmail.com>2021-10-26 08:44:50 +0200
committerMax Hilbrunner <m.hilbrunner@gmail.com>2021-10-26 13:58:58 +0200
commit5dc02eb8b0e30a3ede3be7e341a2681e92cf3562 (patch)
treeb005aa03b8dc9ad92469836e673587263b205e23 /core
parent64faa37e4501afed96f40b50d42d8a0614cf583d (diff)
Save all 64 bits of get_ticks_msec() in more cases
Diffstat (limited to 'core')
-rw-r--r--core/core_bind.h2
-rw-r--r--core/debugger/remote_debugger.cpp4
-rw-r--r--core/object/undo_redo.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/core_bind.h b/core/core_bind.h
index 4eab085dda..3eb4c914a1 100644
--- a/core/core_bind.h
+++ b/core/core_bind.h
@@ -205,7 +205,7 @@ public:
void delay_usec(int p_usec) const;
void delay_msec(int p_msec) const;
- uint32_t get_ticks_msec() const;
+ uint64_t get_ticks_msec() const;
uint64_t get_ticks_usec() const;
bool can_use_threads() const;
diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp
index 9967d1e361..4607bd2f3f 100644
--- a/core/debugger/remote_debugger.cpp
+++ b/core/debugger/remote_debugger.cpp
@@ -79,8 +79,8 @@ public:
ERR_FAIL_COND_V(p_buffer.size() == 0, 0);
int total_bandwidth = 0;
- uint32_t timestamp = OS::get_singleton()->get_ticks_msec();
- uint32_t final_timestamp = timestamp - 1000;
+ uint64_t timestamp = OS::get_singleton()->get_ticks_msec();
+ uint64_t final_timestamp = timestamp - 1000;
int i = (p_pointer + p_buffer.size() - 1) % p_buffer.size();
diff --git a/core/object/undo_redo.cpp b/core/object/undo_redo.cpp
index 9c84c2add7..07006e7968 100644
--- a/core/object/undo_redo.cpp
+++ b/core/object/undo_redo.cpp
@@ -76,7 +76,7 @@ bool UndoRedo::_redo(bool p_execute) {
}
void UndoRedo::create_action(const String &p_name, MergeMode p_mode) {
- uint32_t ticks = OS::get_singleton()->get_ticks_msec();
+ uint64_t ticks = OS::get_singleton()->get_ticks_msec();
if (action_level == 0) {
_discard_redo();