diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-09 20:48:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 20:48:45 +0100 |
| commit | 33c907f9f5b3ec1a43d0251d7cac80da49b5b658 (patch) | |
| tree | 6adb187024a8de7ed0b2ebf3e7c75ae07d8407bf /scene/multiplayer/scene_rpc_interface.cpp | |
| parent | f17c5501eb4bb6a86d9f2f07567da081eb8991b0 (diff) | |
| parent | 21637dfc2535a00f531b8b664c1e66ba34d11eb0 (diff) | |
Merge pull request #58929 from reduz/remove-variant-arg-macros
Remove VARIANT_ARG* macros
Diffstat (limited to 'scene/multiplayer/scene_rpc_interface.cpp')
| -rw-r--r-- | scene/multiplayer/scene_rpc_interface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/multiplayer/scene_rpc_interface.cpp b/scene/multiplayer/scene_rpc_interface.cpp index 2239a5d81c..84700a82f3 100644 --- a/scene/multiplayer/scene_rpc_interface.cpp +++ b/scene/multiplayer/scene_rpc_interface.cpp @@ -278,7 +278,7 @@ void SceneRPCInterface::_process_rpc(Node *p_node, const uint16_t p_rpc_method_i Callable::CallError ce; - p_node->call(config.name, (const Variant **)argp.ptr(), argc, ce); + p_node->callp(config.name, (const Variant **)argp.ptr(), argc, ce); if (ce.error != Callable::CallError::CALL_OK) { String error = Variant::get_call_error_text(p_node, config.name, (const Variant **)argp.ptr(), argc, ce); error = "RPC - " + error; @@ -480,7 +480,7 @@ void SceneRPCInterface::rpcp(Object *p_obj, int p_peer_id, const StringName &p_m Callable::CallError ce; multiplayer->set_remote_sender_override(peer->get_unique_id()); - node->call(p_method, p_arg, p_argcount, ce); + node->callp(p_method, p_arg, p_argcount, ce); multiplayer->set_remote_sender_override(0); if (ce.error != Callable::CallError::CALL_OK) { @@ -496,7 +496,7 @@ void SceneRPCInterface::rpcp(Object *p_obj, int p_peer_id, const StringName &p_m ce.error = Callable::CallError::CALL_OK; multiplayer->set_remote_sender_override(peer->get_unique_id()); - node->get_script_instance()->call(p_method, p_arg, p_argcount, ce); + node->get_script_instance()->callp(p_method, p_arg, p_argcount, ce); multiplayer->set_remote_sender_override(0); if (ce.error != Callable::CallError::CALL_OK) { |