diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-02 13:15:53 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-02 13:15:53 +0200 |
| commit | e95b7e84a46fb47a7981b030a07499dba969fb95 (patch) | |
| tree | bae0893558467a10341d5a7cdc02047328792f37 /scene | |
| parent | 7588e3ff0dd7f5e522009f770f99fe593d1ebdb0 (diff) | |
| parent | aff767ef0787db47890a4e33d567b25c4b8ec060 (diff) | |
| download | redot-engine-e95b7e84a46fb47a7981b030a07499dba969fb95.tar.gz | |
Merge pull request #80844 from dalexeev/fix-callable-expected-argc
Fix expected argument count for `Callable` call errors
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/tree.cpp | 2 | ||||
| -rw-r--r-- | scene/main/node.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index e2b16cdd66..dab2709257 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1476,7 +1476,7 @@ Size2 TreeItem::get_minimum_size(int p_column) { void TreeItem::_call_recursive_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { if (p_argcount < 1) { r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; - r_error.argument = 0; + r_error.expected = 1; return; } diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 5a107188fa..421760b23f 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -675,7 +675,7 @@ const Variant Node::get_node_rpc_config() const { Error Node::_rpc_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { if (p_argcount < 1) { r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; - r_error.argument = 1; + r_error.expected = 1; return ERR_INVALID_PARAMETER; } @@ -697,7 +697,7 @@ Error Node::_rpc_bind(const Variant **p_args, int p_argcount, Callable::CallErro Error Node::_rpc_id_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { if (p_argcount < 2) { r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; - r_error.argument = 2; + r_error.expected = 2; return ERR_INVALID_PARAMETER; } @@ -3162,7 +3162,7 @@ void Node::unhandled_key_input(const Ref<InputEvent> &p_key_event) { Variant Node::_call_deferred_thread_group_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { if (p_argcount < 1) { r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; - r_error.argument = 0; + r_error.expected = 1; return Variant(); } @@ -3185,7 +3185,7 @@ Variant Node::_call_deferred_thread_group_bind(const Variant **p_args, int p_arg Variant Node::_call_thread_safe_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { if (p_argcount < 1) { r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; - r_error.argument = 0; + r_error.expected = 1; return Variant(); } |