[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.401,1.402 script_v72he.cpp,2.99,2.100 script_v80he.cpp,2.26,2.27 script_v90he.cpp,2.35,2.36

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv354/scumm

Modified Files:
	script_v6.cpp script_v72he.cpp script_v80he.cpp 
	script_v90he.cpp 
Log Message:

A few more corrections, fixes freddi2 crash.


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- script_v6.cpp	16 Sep 2004 14:31:16 -0000	1.401
+++ script_v6.cpp	16 Sep 2004 23:34:25 -0000	1.402
@@ -3021,7 +3021,7 @@
 	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(value));
 	dim1 = FROM_LE_16(ah->dim1) - 1;
 
-	if (dim1 <= num) {
+	if (dim1 < num) {
 		int16 var_2 = readArray(value, 0, num - 1);
 		shuffleArray(value, 1, dim1);
 		if (readArray(value, 0, 1) == var_2) {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.99
retrieving revision 2.100
diff -u -d -r2.99 -r2.100
--- script_v72he.cpp	16 Sep 2004 14:31:16 -0000	2.99
+++ script_v72he.cpp	16 Sep 2004 23:34:26 -0000	2.100
@@ -1718,7 +1718,7 @@
 	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(value));
 	dim1end = FROM_LE_32(ah->dim1end);
 
-	if (dim1end <= num) {
+	if (dim1end < num) {
 		int16 var_2 = readArray(value, 0, num - 1);
 		shuffleArray(value, 1, dim1end);
 		if (readArray(value, 0, 1) == var_2) {

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -d -r2.26 -r2.27
--- script_v80he.cpp	16 Sep 2004 14:31:16 -0000	2.26
+++ script_v80he.cpp	16 Sep 2004 23:34:26 -0000	2.27
@@ -641,8 +641,9 @@
 	if (dim1end < num) {
 		int16 var_2 = readArray(value, 0, num - 1);
 		shuffleArray(value, 1, dim1end);
-		if (readArray(value, 0, 1) == var_2 && var_2 >= 3) {
-			int tmp = readArray(value, 0, 2);
+		num = 1;
+		if (readArray(value, 0, 1) == var_2 && dim1end >= 3) {
+			int16 tmp = readArray(value, 0, 2);
 			writeArray(value, 0, num, tmp);
 			writeArray(value, 0, 2, var_2);
 		}

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- script_v90he.cpp	15 Sep 2004 12:40:49 -0000	2.35
+++ script_v90he.cpp	16 Sep 2004 23:34:26 -0000	2.36
@@ -328,7 +328,7 @@
 		OPCODE(o6_soundOps),
 		OPCODE(o72_getPixel),
 		OPCODE(o6_localizeArray),
-		OPCODE(o72_pickVarRandom),
+		OPCODE(o80_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
 		OPCODE(o6_invalid),