[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.313,2.314 script_v80he.cpp,2.127,2.128

kirben kirben at users.sourceforge.net
Sun Nov 6 03:34:28 CET 2005


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

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

Should be int32 in HE games, to avoid possible overflow.


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.313
retrieving revision 2.314
diff -u -d -r2.313 -r2.314
--- script_v72he.cpp	26 Oct 2005 06:48:07 -0000	2.313
+++ script_v72he.cpp	6 Nov 2005 11:33:58 -0000	2.314
@@ -1972,7 +1972,7 @@
 	dim1end = FROM_LE_32(ah->dim1end);
 
 	if (dim1end < num) {
-		int16 var_2 = readArray(value, 0, num - 1);
+		int32 var_2 = readArray(value, 0, num - 1);
 		shuffleArray(value, 1, dim1end);
 		if (readArray(value, 0, 1) == var_2) {
 			num = 2;

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.127
retrieving revision 2.128
diff -u -d -r2.127 -r2.128
--- script_v80he.cpp	19 Oct 2005 09:43:13 -0000	2.127
+++ script_v80he.cpp	6 Nov 2005 11:33:58 -0000	2.128
@@ -795,11 +795,11 @@
 	dim1end = FROM_LE_32(ah->dim1end);
 
 	if (dim1end < num) {
-		int16 var_2 = readArray(value, 0, num - 1);
+		int32 var_2 = readArray(value, 0, num - 1);
 		shuffleArray(value, 1, dim1end);
 		num = 1;
 		if (readArray(value, 0, 1) == var_2 && dim1end >= 3) {
-			int16 tmp = readArray(value, 0, 2);
+			int32 tmp = readArray(value, 0, 2);
 			writeArray(value, 0, num, tmp);
 			writeArray(value, 0, 2, var_2);
 		}





More information about the Scummvm-git-logs mailing list