diff options
| author | Max Horn | 2002-12-25 19:06:31 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 19:06:31 +0000 |
| commit | 447ab20369fb41e47320bf3318e1bebe531c4fd8 (patch) | |
| tree | 4b4574acec3faa9e390de0762db72650efaa9733 /scumm/script.cpp | |
| parent | 7c7af18bc92adf0dc122784c72cc30b51758b0a8 (diff) | |
| download | scummvm-rg350-447ab20369fb41e47320bf3318e1bebe531c4fd8.tar.gz scummvm-rg350-447ab20369fb41e47320bf3318e1bebe531c4fd8.tar.bz2 scummvm-rg350-447ab20369fb41e47320bf3318e1bebe531c4fd8.zip | |
cleanup
svn-id: r6140
Diffstat (limited to 'scumm/script.cpp')
| -rw-r--r-- | scumm/script.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 7d036bdd7d..5b4b4213eb 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -131,9 +131,8 @@ void Scumm::stopObjectScript(int script) ss = &vm.slot[1]; for (i = 1; i < NUM_SCRIPT_SLOT; i++, ss++) { - if (script == ss->number && (ss->where == WIO_ROOM || - ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT) - && ss->status != ssDead) { + if (script == ss->number && ss->status != ssDead && + (ss->where == WIO_ROOM || ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)) { if (ss->cutsceneOverride) error("Object %d stopped with active cutscene/override", script); ss->number = 0; |