diff options
| author | Raul Santos <raulsntos@gmail.com> | 2022-07-29 21:56:02 +0200 |
|---|---|---|
| committer | Raul Santos <raulsntos@gmail.com> | 2022-07-29 21:56:02 +0200 |
| commit | ca47471dfa632a2c6ca34c6cf074cf81d6fac6ea (patch) | |
| tree | 924d50daeb8195f33e78461076dd4ad5f429c1cd | |
| parent | 5ca09b322c0dea3f71de3239c2da2a72d987f67d (diff) | |
| download | redot-engine-ca47471dfa632a2c6ca34c6cf074cf81d6fac6ea.tar.gz | |
Fix Callable calls in mono module
The `Callable::call` and `Callable::call_deferred` methods have been
renamed to `Callable::callp` and `Callable::call_deferredp`.
| -rw-r--r-- | modules/mono/glue/callable_glue.cpp | 4 | ||||
| -rw-r--r-- | modules/mono/signal_awaiter_utils.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/mono/glue/callable_glue.cpp b/modules/mono/glue/callable_glue.cpp index e59b34313c..521dc3dff7 100644 --- a/modules/mono/glue/callable_glue.cpp +++ b/modules/mono/glue/callable_glue.cpp @@ -49,7 +49,7 @@ MonoObject *godot_icall_Callable_Call(GDMonoMarshal::M_Callable *p_callable, Mon Variant result; Callable::CallError error; - callable.call(args.ptr(), argc, result, error); + callable.callp(args.ptr(), argc, result, error); return GDMonoMarshal::variant_to_mono_object(result); } @@ -68,7 +68,7 @@ void godot_icall_Callable_CallDeferred(GDMonoMarshal::M_Callable *p_callable, Mo args.set(i, &arg_store.get(i)); } - callable.call_deferred(args.ptr(), argc); + callable.call_deferredp(args.ptr(), argc); } void godot_register_callable_icalls() { diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp index 618e1b58e0..437c4ca54a 100644 --- a/modules/mono/signal_awaiter_utils.cpp +++ b/modules/mono/signal_awaiter_utils.cpp @@ -44,7 +44,7 @@ Error gd_mono_connect_signal_awaiter(Object *p_source, const StringName &p_signa SignalAwaiterCallable *awaiter_callable = memnew(SignalAwaiterCallable(p_target, p_awaiter, p_signal)); Callable callable = Callable(awaiter_callable); - return p_source->connect(p_signal, callable, Vector<Variant>(), Object::CONNECT_ONESHOT); + return p_source->connect(p_signal, callable, Object::CONNECT_ONESHOT); } bool SignalAwaiterCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) { |