godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17291 from Warlaan/master 

completed-signal for coroutines with more than one yield
This commit is contained in:
Hein-Pieter van Braam 2018-03-15 23:11:37 +01:00 committed by GitHub
parent 64b336b367 3dfef37628
commit aed2fedd16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gdscript/gdscript_function.cpp
View File

@ -1535,15 +1535,21 @@ Variant GDScriptFunctionState::_signal_callback(const Variant **p_args, int p_ar
// then the function did yield again after resuming.
if (ret.is_ref()) {
GDScriptFunctionState *gdfs = Object::cast_to<GDScriptFunctionState>(ret);
if (gdfs && gdfs->function == function)
if (gdfs && gdfs->function == function) {
completed = false;
gdfs->previous_state = Ref<GDScriptFunctionState>(this);
}
}
function = NULL; //cleaned up;
state.result = Variant();
if (completed) {
emit_signal("completed", ret);
GDScriptFunctionState *state = this;
while (state != NULL) {
state->emit_signal("completed", ret);
state = *(state->previous_state);
}
}
return ret;
@ -1591,15 +1597,21 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
// then the function did yield again after resuming.
if (ret.is_ref()) {
GDScriptFunctionState *gdfs = Object::cast_to<GDScriptFunctionState>(ret);
if (gdfs && gdfs->function == function)
if (gdfs && gdfs->function == function) {
completed = false;
gdfs->previous_state = Ref<GDScriptFunctionState>(this);
}
}
function = NULL; //cleaned up;
state.result = Variant();
if (completed) {
emit_signal("completed", ret);
GDScriptFunctionState *state = this;
while (state != NULL) {
state->emit_signal("completed", ret);
state = *(state->previous_state);
}
}
return ret;

1
modules/gdscript/gdscript_function.h
View File

@ -234,6 +234,7 @@ class GDScriptFunctionState : public Reference {
GDScriptFunction *function;
GDScriptFunction::CallState state;
Variant _signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
Ref<GDScriptFunctionState> previous_state;
protected:
static void _bind_methods();