godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Fix #6583, Condition + Wait nodes freezing the game

Browse Source 
Make sure that only the first node after VS resume gets resumed
This commit is contained in:
Bojidar Marinov
2017-08-19 17:54:32 +03:00
parent 5d85108f94
commit 4a0b4417a3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/visual_script/visual_script.cpp
View File

@@ -1578,12 +1578,15 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
VisualScriptNodeInstance::StartMode start_mode; VisualScriptNodeInstance::StartMode start_mode;
{ {
if (p_resuming_yield) if (p_resuming_yield) {
start_mode = VisualScriptNodeInstance::START_MODE_RESUME_YIELD; start_mode = VisualScriptNodeInstance::START_MODE_RESUME_YIELD;
else if (!flow_stack || !(flow_stack[flow_stack_pos] & VisualScriptNodeInstance::FLOW_STACK_PUSHED_BIT)) //if there is a push bit, it means we are continuing a sequence p_resuming_yield = false; // should resume only the first time
start_mode = VisualScriptNodeInstance::START_MODE_BEGIN_SEQUENCE; } else if (flow_stack && (flow_stack[flow_stack_pos] & VisualScriptNodeInstance::FLOW_STACK_PUSHED_BIT)) {
else //if there is a push bit, it means we are continuing a sequence
start_mode = VisualScriptNodeInstance::START_MODE_CONTINUE_SEQUENCE; start_mode = VisualScriptNodeInstance::START_MODE_CONTINUE_SEQUENCE;
} else {
start_mode = VisualScriptNodeInstance::START_MODE_BEGIN_SEQUENCE;
}
} }
VSDEBUG("STEP - STARTSEQ: " + itos(start_mode)); VSDEBUG("STEP - STARTSEQ: " + itos(start_mode));