[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.129,1.130

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10114

Modified Files:
	script.cpp 
Log Message:
cleanup

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- script.cpp	6 Sep 2003 23:29:35 -0000	1.129
+++ script.cpp	10 Sep 2003 14:43:42 -0000	1.130
@@ -217,20 +217,19 @@
 		}
 	}
 
-	if (_numNestedScripts == 0)
-		return;
-
 	nest = vm.nest;
 	num = _numNestedScripts;
 
-	do {
+	while (num > 0) {
 		if (nest->number == script &&
 				(nest->where == WIO_GLOBAL || nest->where == WIO_LOCAL)) {
 			nest->number = 0xFF;
 			nest->slot = 0xFF;
 			nest->where = 0xFF;
 		}
-	} while (nest++, --num);
+		nest++;
+		num--;
+	}
 }
 
 /* Stop an object script 'script'*/
@@ -255,20 +254,19 @@
 		}
 	}
 
-	if (_numNestedScripts == 0)
-		return;
-
 	nest = vm.nest;
 	num = _numNestedScripts;
 
-	do {
+	while (num > 0) {
 		if (nest->number == script &&
 				(nest->where == WIO_ROOM || nest->where == WIO_INVENTORY || nest->where == WIO_FLOBJECT)) {
 			nest->number = 0xFF;
 			nest->slot = 0xFF;
 			nest->where = 0xFF;
 		}
-	} while (nest++, --num);
+		nest++;
+		num--;
+	}
 }
 
 /* Return a free script slot */