diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-05 12:29:15 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-05 12:29:15 +0200 |
commit | 57256d712cc0c677043c81ab429fe255ce60fcbb (patch) | |
tree | 286927a2063b42d350257896e308dfc1ed6fb03a /platform/web/javascript_bridge_singleton.cpp | |
parent | c7ed5d795ef396650e1e2853cf0d76cbdb1cb45e (diff) | |
parent | 09b30be86dd3034b46ae26c1ecde1f9ad941a5c8 (diff) | |
download | redot-engine-57256d712cc0c677043c81ab429fe255ce60fcbb.tar.gz |
Merge pull request #79341 from KoBeWi/callp_without_p_is_just_call
Add vararg `call()` method to C++ Callable
Diffstat (limited to 'platform/web/javascript_bridge_singleton.cpp')
-rw-r--r-- | platform/web/javascript_bridge_singleton.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/platform/web/javascript_bridge_singleton.cpp b/platform/web/javascript_bridge_singleton.cpp index 41206f14a5..1bb72456e8 100644 --- a/platform/web/javascript_bridge_singleton.cpp +++ b/platform/web/javascript_bridge_singleton.cpp @@ -256,15 +256,12 @@ void JavaScriptObjectImpl::_callback(void *p_ref, int p_args_id, int p_argc) { int type = godot_js_wrapper_object_getvar(p_args_id, Variant::INT, &exchange); arg_arr.push_back(_js2variant(type, &exchange)); } - Variant arg = arg_arr; - const Variant *argv[1] = { &arg }; - Callable::CallError err; - Variant ret; - obj->_callable.callp(argv, 1, ret, err); + obj->_callable.call(arg_arr); // Set return value godot_js_wrapper_ex exchange; void *lock = nullptr; + Variant ret; const Variant *v = &ret; int type = _variant2js((const void **)&v, 0, &exchange, &lock); godot_js_wrapper_object_set_cb_ret(type, &exchange); |