diff options
| author | Max Horn | 2003-05-18 23:19:43 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-18 23:19:43 +0000 |
| commit | f6d1e711945718261a298904ba6012dd7c119346 (patch) | |
| tree | e7c9f8f3078f7491986d0dc0586c85e74defefa1 /scumm | |
| parent | 1f8d481acbcd0eac2c3b4165bc1fd01afe1d056b (diff) | |
| download | scummvm-rg350-f6d1e711945718261a298904ba6012dd7c119346.tar.gz scummvm-rg350-f6d1e711945718261a298904ba6012dd7c119346.tar.bz2 scummvm-rg350-f6d1e711945718261a298904ba6012dd7c119346.zip | |
oops
svn-id: r7649
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 4d92ee48f6..f7625f67c2 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -90,7 +90,7 @@ void Scumm::stopScriptNr(int script) { ss = vm.slot; for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) { if (script == ss->number && ss->status != ssDead && - (ss->where == WIO_GLOBAL && ss->where == WIO_LOCAL)) { + (ss->where == WIO_GLOBAL || ss->where == WIO_LOCAL)) { if (ss->cutsceneOverride) error("Script %d stopped with active cutscene/override", script); ss->number = 0; |