godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63656 from raulsntos/fix-signal-bind-csharp

This commit is contained in:
Rémi Verschelde 2022-07-31 13:29:31 +02:00 committed by GitHub
parent 4aa355b0d1 ca47471dfa
commit 556cc22dd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/glue/callable_glue.cpp
View File

@ -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() {

2
modules/mono/signal_awaiter_utils.cpp
View File

@ -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) {