From accdd575f675b9a742b0b5e672a6aadd5a873113 Mon Sep 17 00:00:00 2001 From: "Andrii Doroshenko (Xrayez)" Date: Fri, 4 Oct 2019 00:01:12 +0300 Subject: [PATCH] Make `dict2inst` to work with arbitrary `_init` parameters This is achieved by skipping initializer call while creating an instance of a GDScript. This is implemented by passing -1 as an argument count to `_new` and interpreting any value below 0 to mean that the initializer should not be called during instantiation, because internal members of an instance are going to be overridden afterwards. --- modules/gdscript/gdscript.cpp | 6 ++++-- modules/gdscript/gdscript_functions.cpp | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 6cbd234c100..7d5d0b28c81 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -110,6 +110,9 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco instances.insert(instance->owner); GDScriptLanguage::singleton->lock.unlock(); + if (p_argcount < 0) { + return instance; + } initializer->call(instance, p_args, p_argcount, r_error); if (r_error.error != Variant::CallError::CALL_OK) { @@ -123,9 +126,8 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco GDScriptLanguage::singleton->lock.unlock(); #endif - ERR_FAIL_COND_V(r_error.error != Variant::CallError::CALL_OK, nullptr); //error constructing + ERR_FAIL_V_MSG(nullptr, "Error constructing a GDScriptInstance."); } - //@TODO make thread safe return instance; } diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index bb8ef69a158..b60a7d26da5 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -1153,8 +1153,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_ return; } } - - r_ret = gdscr->_new(nullptr, 0, r_error); + r_ret = gdscr->_new(nullptr, -1 /*skip initializer*/, r_error); if (r_error.error != Variant::CallError::CALL_OK) { r_ret = Variant();