Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-03 09:32:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #8798 from RandomShaper/gdfs-ext-check

Browse Source 
Add extended check option to GDFunctionState::is_valid()
This commit is contained in:
Rémi Verschelde 2017-05-18 12:51:29 +02:00 committed by GitHub
commit dcc44f05b7
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/base/classes.xml
View File

@ -15433,6 +15433,10 @@
<method name="is_valid" qualifiers="const">
<return type="bool">
</return>
<argument index="0" name="extended_check" type="bool" default="false">
If true, also check if the associated script and object still exists.
The extended check is done in debug mode as part of [method GDFunctionState.resume], but you can use this if you know you may be trying to resume without knowing for sure the object and/or script have survived up to that point.
</argument>
<description>
Check whether the function call may be resumed. This is not the case if the function state was already resumed.
</description>

18
modules/gdscript/gd_function.cpp
View File

@ -1433,9 +1433,21 @@ Variant GDFunctionState::_signal_callback(const Variant **p_args, int p_argcount
return ret;
}
bool GDFunctionState::is_valid() const {
bool GDFunctionState::is_valid(bool p_extended_check) const {
return function != NULL;
if (function == NULL)
return false;
if (p_extended_check) {
//class instance gone?
if (state.instance_id && !ObjectDB::get_instance(state.instance_id))
return false;
//script gone?
if (state.script_id && !ObjectDB::get_instance(state.script_id))
return false;
}
return true;
}
Variant GDFunctionState::resume(const Variant &p_arg) {
@ -1464,7 +1476,7 @@ Variant GDFunctionState::resume(const Variant &p_arg) {
void GDFunctionState::_bind_methods() {
ClassDB::bind_method(D_METHOD("resume:Variant", "arg"), &GDFunctionState::resume, DEFVAL(Variant()));
ClassDB::bind_method(D_METHOD("is_valid"), &GDFunctionState::is_valid);
ClassDB::bind_method(D_METHOD("is_valid", "extended_check"), &GDFunctionState::is_valid, DEFVAL(false));
ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "_signal_callback", &GDFunctionState::_signal_callback, MethodInfo("_signal_callback"));
}

2
modules/gdscript/gd_function.h
View File

@ -237,7 +237,7 @@ protected:
static void _bind_methods();
public:
bool is_valid() const;
bool is_valid(bool p_extended_check = false) const;
Variant resume(const Variant &p_arg = Variant());
GDFunctionState();
~GDFunctionState();