From 6616b0619d710040959fe585440c528a99c7b280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Wed, 18 Jan 2023 19:14:14 +0100 Subject: [PATCH] Revert "Make MessageQueue::push_callable(p) work with bound arguments" This reverts commit 81b1ebddefc5e3775331b70ea09dfb7d23a4ee1e. --- core/object/message_queue.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/core/object/message_queue.cpp b/core/object/message_queue.cpp index 22ed8b43785..ebed6c21e91 100644 --- a/core/object/message_queue.cpp +++ b/core/object/message_queue.cpp @@ -114,11 +114,7 @@ Error MessageQueue::push_set(Object *p_object, const StringName &p_prop, const V Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error) { _THREAD_SAFE_METHOD_ - Vector bound_arguments; - int bound_argcount = 0; - p_callable.get_bound_arguments_ref(bound_arguments, bound_argcount); - - int room_needed = sizeof(Message) + sizeof(Variant) * (bound_argcount + p_argcount); + int room_needed = sizeof(Message) + sizeof(Variant) * p_argcount; if ((buffer_end + room_needed) >= buffer_size) { print_line("Failed method: " + p_callable); @@ -127,7 +123,7 @@ Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p } Message *msg = memnew_placement(&buffer[buffer_end], Message); - msg->args = bound_argcount + p_argcount; + msg->args = p_argcount; msg->callable = p_callable; msg->type = TYPE_CALL; if (p_show_error) { @@ -136,11 +132,6 @@ Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p buffer_end += sizeof(Message); - for (int i = 0; i < bound_argcount; i++) { - Variant *v = memnew_placement(&buffer[buffer_end], Variant); - buffer_end += sizeof(Variant); - *v = bound_arguments[i]; - } for (int i = 0; i < p_argcount; i++) { Variant *v = memnew_placement(&buffer[buffer_end], Variant); buffer_end += sizeof(Variant);