diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-24 16:05:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-24 16:05:59 +0200 |
commit | 4698dc67b575a93d83933147207b0e57e7a58672 (patch) | |
tree | e182c2313f758d5babf2ab9b8c159a93ac2e9b54 /modules/gdscript/gdscript_utility_functions.cpp | |
parent | 5d14d0870269eb6c4eeb7bff6e8e66dfd0f4773e (diff) | |
parent | f7f4873ed08d6b465c8108f7ce0c1cb76f9caf2f (diff) |
Merge pull request #64082 from KoBeWi/array3k
Diffstat (limited to 'modules/gdscript/gdscript_utility_functions.cpp')
-rw-r--r-- | modules/gdscript/gdscript_utility_functions.cpp | 5 |
1 files changed, 3 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); |