diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-06-20 01:15:02 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-20 01:15:02 -0300 |
commit | 5e816fd8c8e8c97e22f636573667a99ac705e56c (patch) | |
tree | 0d224c31f6c3abd7bb40fb5cf9f107d57ae0e494 /modules/gdscript | |
parent | 6e9e57beaa7876479a629c32a31c98f7699b9773 (diff) |
Property reporty base type when a function fails, fixes #4581 probably also closes other issues
Diffstat (limited to 'modules/gdscript')
-rw-r--r-- | modules/gdscript/gd_function.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp index 9d438998cb..6e52686de4 100644 --- a/modules/gdscript/gd_function.cpp +++ b/modules/gdscript/gd_function.cpp @@ -654,10 +654,10 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a if (call_ret) { GET_VARIANT_PTR(ret,argc); - *ret = base->call(*methodname,(const Variant**)argptrs,argc,err); + base->call_ptr(*methodname,(const Variant**)argptrs,argc,ret,err); } else { - base->call(*methodname,(const Variant**)argptrs,argc,err); + base->call_ptr(*methodname,(const Variant**)argptrs,argc,NULL,err); } #ifdef DEBUG_ENABLED if (GDScriptLanguage::get_singleton()->profiling) { |