diff options
| author | Strangerke | 2013-09-11 21:33:10 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-11 21:33:10 +0200 |
| commit | da1a427e794434a09cd39ab45e32ae7afca9a170 (patch) | |
| tree | 85b4700515bc7853e4f90ddae22bc3b785c4ab3a /engines/wintermute/base/scriptables/script_engine.cpp | |
| parent | 49dbac6a2a5cde294a4c4c9a47467e7b5d95e08b (diff) | |
| parent | 5c6ee7573c0cf05bbbb154d4734e94e478f453e5 (diff) | |
| download | scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.tar.gz scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.tar.bz2 scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.zip | |
Merge branch 'master' of https://github.com/urukgit/scummvm into avalanche
Diffstat (limited to 'engines/wintermute/base/scriptables/script_engine.cpp')
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index dd24457d6c..bb819b23e4 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -362,6 +362,8 @@ bool ScEngine::tick() { ////////////////////////////////////////////////////////////////////////// bool ScEngine::tickUnbreakable() { + ScScript *oldScript = _currentScript; + // execute unbreakable scripts for (uint32 i = 0; i < _scripts.size(); i++) { if (!_scripts[i]->_unbreakable) { @@ -373,9 +375,12 @@ bool ScEngine::tickUnbreakable() { _scripts[i]->executeInstruction(); } _scripts[i]->finish(); - _currentScript = nullptr; + _currentScript = oldScript; } - removeFinishedScripts(); + + // NB: Don't remove finished scripts here since we could be recursively + // executing scripts. Doing so could invalidate the outer iteration in + // ::tick() over _scripts. return STATUS_OK; } |