diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-09 16:27:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-09 16:27:18 +0200 |
| commit | e581eb135932c31556fe796079d297246f9adaf1 (patch) | |
| tree | 3e4408fe921d50dad7eef9ea2fdb61bc8f1a1907 /core/message_queue.cpp | |
| parent | 84058ab8ac9b7543da3971162c3a1b1d2fe05b89 (diff) | |
| parent | 702b539405baf6eaa536b37a9bb5cbcc18142bc8 (diff) | |
Merge pull request #28778 from aaronfranke/lowercase-id
Change "ID" to lowercase "id"
Diffstat (limited to 'core/message_queue.cpp')
| -rw-r--r-- | core/message_queue.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/message_queue.cpp b/core/message_queue.cpp index c57bd4081c..1d661f25f9 100644 --- a/core/message_queue.cpp +++ b/core/message_queue.cpp @@ -58,7 +58,7 @@ Error MessageQueue::push_call(ObjectID p_id, const StringName &p_method, const V Message *msg = memnew_placement(&buffer[buffer_end], Message); msg->args = p_argcount; - msg->instance_ID = p_id; + msg->instance_id = p_id; msg->target = p_method; msg->type = TYPE_CALL; if (p_show_error) @@ -109,7 +109,7 @@ Error MessageQueue::push_set(ObjectID p_id, const StringName &p_prop, const Vari Message *msg = memnew_placement(&buffer[buffer_end], Message); msg->args = 1; - msg->instance_ID = p_id; + msg->instance_id = p_id; msg->target = p_prop; msg->type = TYPE_SET; @@ -143,7 +143,7 @@ Error MessageQueue::push_notification(ObjectID p_id, int p_notification) { Message *msg = memnew_placement(&buffer[buffer_end], Message); msg->type = TYPE_NOTIFICATION; - msg->instance_ID = p_id; + msg->instance_id = p_id; //msg->target; msg->notification = p_notification; @@ -177,7 +177,7 @@ void MessageQueue::statistics() { while (read_pos < buffer_end) { Message *message = (Message *)&buffer[read_pos]; - Object *target = ObjectDB::get_instance(message->instance_ID); + Object *target = ObjectDB::get_instance(message->instance_id); if (target != NULL) { @@ -289,7 +289,7 @@ void MessageQueue::flush() { _THREAD_SAFE_UNLOCK_ - Object *target = ObjectDB::get_instance(message->instance_ID); + Object *target = ObjectDB::get_instance(message->instance_id); if (target != NULL) { |