diff options
| author | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2017-08-19 17:54:32 +0300 |
|---|---|---|
| committer | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2017-08-19 17:54:32 +0300 |
| commit | 4a0b4417a32d1d45f74be4bb781f55deacd10d5b (patch) | |
| tree | 3b1d85a27f8410e29a6f5ae6a2f4780067db992c /modules/visual_script | |
| parent | 5d85108f9448ac47b871f19c8af4652b7d3dea9d (diff) | |
Fix #6583, Condition + Wait nodes freezing the game
Make sure that only the first node after VS resume gets resumed
Diffstat (limited to 'modules/visual_script')
| -rw-r--r-- | modules/visual_script/visual_script.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index d1cf0f1dce..8cbfb8f3fd 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -1578,12 +1578,15 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p VisualScriptNodeInstance::StartMode start_mode; { - if (p_resuming_yield) + if (p_resuming_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 - start_mode = VisualScriptNodeInstance::START_MODE_BEGIN_SEQUENCE; - else + p_resuming_yield = false; // should resume only the first time + } 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 start_mode = VisualScriptNodeInstance::START_MODE_CONTINUE_SEQUENCE; + } else { + start_mode = VisualScriptNodeInstance::START_MODE_BEGIN_SEQUENCE; + } } VSDEBUG("STEP - STARTSEQ: " + itos(start_mode)); |