asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #87783 from AThousandShips/utility_err

Browse source 
Make `GDScriptUtilityCallable` return call error when method is invalid
This commit is contained in:
Rémi Verschelde 2024-02-07 10:59:17 +01:00
commit 9cfd6dbab2
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/gdscript/gdscript_utility_callable.cpp
View file

@ -83,7 +83,10 @@ ObjectID GDScriptUtilityCallable::get_object() const {
void GDScriptUtilityCallable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { void GDScriptUtilityCallable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const {
switch (type) { switch (type) {
case TYPE_INVALID: case TYPE_INVALID:
ERR_PRINT(vformat(R"(Trying to call invalid utility function "%s".)", function_name)); r_return_value = vformat(R"(Trying to call invalid utility function "%s".)", function_name);
r_call_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
r_call_error.argument = 0;
r_call_error.expected = 0;
break; break;
case TYPE_GLOBAL: case TYPE_GLOBAL:
Variant::call_utility_function(function_name, &r_return_value, p_arguments, p_argcount, r_call_error); Variant::call_utility_function(function_name, &r_return_value, p_arguments, p_argcount, r_call_error);