From 447ab20369fb41e47320bf3318e1bebe531c4fd8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 25 Dec 2002 19:06:31 +0000
Subject: cleanup

svn-id: r6140
---
 scumm/script.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'scumm/script.cpp')

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;
-- 
cgit v1.2.3