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

Merge pull request #26629 from bojidar-bg/18386-object-callv-errors 

Print errors comming from callv
This commit is contained in:
Rémi Verschelde 2019-03-05 12:44:01 +01:00 committed by GitHub
parent ecd8795755 dadcb33302
commit 45e7306b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/object.cpp
View File

@ -832,23 +832,22 @@ void Object::setvar(const Variant &p_key, const Variant &p_value, bool *r_valid)
} }
Variant Object::callv(const StringName &p_method, const Array &p_args) { Variant Object::callv(const StringName &p_method, const Array &p_args) {
const Variant **argptrs = NULL;
if (p_args.size() == 0) { if (p_args.size() > 0) {
return call(p_method); argptrs = (const Variant **)alloca(sizeof(Variant *) * p_args.size());
} for (int i = 0; i < p_args.size(); i++) {
argptrs[i] = &p_args[i];
Vector<Variant> args; }
args.resize(p_args.size());
Vector<const Variant *> argptrs;
argptrs.resize(p_args.size());
for (int i = 0; i < p_args.size(); i++) {
args.write[i] = p_args[i];
argptrs.write[i] = &args[i];
} }
Variant::CallError ce; Variant::CallError ce;
return call(p_method, (const Variant **)argptrs.ptr(), p_args.size(), ce); Variant ret = call(p_method, argptrs, p_args.size(), ce);
if (ce.error != Variant::CallError::CALL_OK) {
ERR_EXPLAIN("Error calling method from 'callv': " + Variant::get_call_error_text(this, p_method, argptrs, p_args.size(), ce));
ERR_FAIL_V(Variant());
}
return ret;
} }
Variant Object::call(const StringName &p_name, VARIANT_ARG_DECLARE) { Variant Object::call(const StringName &p_name, VARIANT_ARG_DECLARE) {