Skip to content

Adds "completed" signal to GDFunctionState #8573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akien-mga merged 1 commit into from
Jul 11, 2017
Merged

Adds "completed" signal to GDFunctionState #8573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions modules/gdscript/gd_function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,8 +1428,24 @@ Variant GDFunctionState::_signal_callback(const Variant **p_args, int p_argcount

state.result = arg;
Variant ret = function->call(NULL, NULL, 0, r_error, &state);

bool completed = true;

// If the return value is a GDFunctionState reference,
// then the function did yield again after resuming.
if (ret.is_ref()) {
GDFunctionState *gdfs = ret.operator Object *()->cast_to<GDFunctionState>();
if (gdfs && gdfs->function == function)
completed = false;
}

function = NULL; //cleaned up;
state.result = Variant();

if (completed) {
emit_signal("completed", ret);
}

return ret;
}

Expand Down Expand Up @@ -1468,8 +1484,24 @@ Variant GDFunctionState::resume(const Variant &p_arg) {
state.result = p_arg;
Variant::CallError err;
Variant ret = function->call(NULL, NULL, 0, err, &state);

bool completed = true;

// If the return value is a GDFunctionState reference,
// then the function did yield again after resuming.
if (ret.is_ref()) {
GDFunctionState *gdfs = ret.operator Object *()->cast_to<GDFunctionState>();
if (gdfs && gdfs->function == function)
completed = false;
}

function = NULL; //cleaned up;
state.result = Variant();

if (completed) {
emit_signal("completed", ret);
}

return ret;
}

Expand All @@ -1478,6 +1510,8 @@ void GDFunctionState::_bind_methods() {
ClassDB::bind_method(D_METHOD("resume:Variant", "arg"), &GDFunctionState::resume, DEFVAL(Variant()));
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"));

ADD_SIGNAL(MethodInfo("completed", PropertyInfo(Variant::NIL, "result")));
}

GDFunctionState::GDFunctionState() {
Expand Down