[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.299,1.300

Eugene Sandulenko sev at users.sourceforge.net
Sat Feb 14 20:00:01 CET 2004


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

Modified Files:
	script_v6.cpp 
Log Message:
More fixes to ScummEngine_v6::o6_pickVarRandom


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- script_v6.cpp	15 Feb 2004 02:47:00 -0000	1.299
+++ script_v6.cpp	15 Feb 2004 03:53:03 -0000	1.300
@@ -3033,7 +3033,7 @@
 			} while (++counter < num);
 		}
 
-		shuffleArray(value, 1, num);
+		shuffleArray(value, 1, num-1);
 		writeArray(value, 0, 0, 2);
 		push(readArray(value, 0, 1));
 		return;
@@ -3050,9 +3050,9 @@
 		var_C = READ_LE_UINT16(ptr + 4);
 	}
 
-	if (var_A <= num) {
+	if (var_A-1 <= num) {
 		int16 var_2 = readArray(value, 0, num - 1);
-		shuffleArray(value, 1, var_A - 1);
+		shuffleArray(value, 1, num - 1);
 		if (readArray(value, 0, 1) == var_2) {
 			num = 2;
 		} else {





More information about the Scummvm-git-logs mailing list