diff options
author | kobewi <kobewi4e@gmail.com> | 2022-08-08 00:52:20 +0200 |
---|---|---|
committer | kobewi <kobewi4e@gmail.com> | 2022-08-24 12:53:36 +0200 |
commit | f7f4873ed08d6b465c8108f7ce0c1cb76f9caf2f (patch) | |
tree | f5644c01ab66109f8f342d784c3a38240aa295ef /modules/gdscript | |
parent | 0626ce50cfd35d1eb81c6c9627f8540be9636b4b (diff) |
Replace Array return types with TypedArray 3
Diffstat (limited to 'modules/gdscript')
-rw-r--r-- | modules/gdscript/gdscript_utility_functions.cpp | 5 | ||||
-rw-r--r-- | modules/gdscript/gdscript_utility_functions.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_utility_functions.cpp b/modules/gdscript/gdscript_utility_functions.cpp index 4b97486cb3..38893a422d 100644 --- a/modules/gdscript/gdscript_utility_functions.cpp +++ b/modules/gdscript/gdscript_utility_functions.cpp @@ -36,6 +36,7 @@ #include "core/object/object.h" #include "core/templates/oa_hash_map.h" #include "core/templates/vector.h" +#include "core/variant/typed_array.h" #include "gdscript.h" #ifdef DEBUG_ENABLED @@ -468,12 +469,12 @@ struct GDScriptUtilityFunctionsDefinitions { static inline void get_stack(Variant *r_ret, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) { VALIDATE_ARG_COUNT(0); if (Thread::get_caller_id() != Thread::get_main_id()) { - *r_ret = Array(); + *r_ret = TypedArray<Dictionary>(); return; } ScriptLanguage *script = GDScriptLanguage::get_singleton(); - Array ret; + TypedArray<Dictionary> ret; for (int i = 0; i < script->debug_get_stack_level_count(); i++) { Dictionary frame; frame["source"] = script->debug_get_stack_level_source(i); diff --git a/modules/gdscript/gdscript_utility_functions.h b/modules/gdscript/gdscript_utility_functions.h index 9ca7cf33d8..0f07db857f 100644 --- a/modules/gdscript/gdscript_utility_functions.h +++ b/modules/gdscript/gdscript_utility_functions.h @@ -34,6 +34,9 @@ #include "core/string/string_name.h" #include "core/variant/variant.h" +template <typename T> +class TypedArray; + class GDScriptUtilityFunctions { public: typedef void (*FunctionPtr)(Variant *r_ret, const Variant **p_args, int p_arg_count, Callable::CallError &r_error); |