diff options
Diffstat (limited to 'script_v1.cpp')
| -rw-r--r-- | script_v1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/script_v1.cpp b/script_v1.cpp index 559876628a..7f758ee62a 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -874,9 +874,8 @@ void Scumm::o5_chainScript() { cur = _currentScript; - if (vm.slot[cur].cutsceneOverride != 0) { - error("Script %d chaining with active cutscene/override"); - } + if (vm.slot[cur].cutsceneOverride != 0) + error("Script %d chaining with active cutscene/override"); vm.slot[cur].number = 0; vm.slot[cur].status = 0; @@ -2105,8 +2104,9 @@ void Scumm::o5_stopScript() { int script; script = getVarOrDirectByte(0x80); - if (script==0) - stopObjectCode(); + if (!script) + // stopObjectCode(); // ENDER - wrong? + stopScriptNr(_currentScript); else stopScriptNr(script); } |