Browse Source

Fix Callable calls in mono module

The `Callable::call` and `Callable::call_deferred` methods have been
renamed to `Callable::callp` and `Callable::call_deferredp`.
Raul Santos 3 years ago
parent
commit
ca47471dfa
2 changed files with 3 additions and 3 deletions
  1. 2 2
      modules/mono/glue/callable_glue.cpp
  2. 1 1
      modules/mono/signal_awaiter_utils.cpp

+ 2 - 2
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() {

+ 1 - 1
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) {