[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.17,2.18

Jonathan Gray khalek at users.sourceforge.net
Wed Aug 25 00:31:10 CEST 2004


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

Modified Files:
	script_v72he.cpp 
Log Message:
casts to avoid gcc warnings

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.17
retrieving revision 2.18
diff -u -d -r2.17 -r2.18
--- script_v72he.cpp	25 Aug 2004 07:18:18 -0000	2.17
+++ script_v72he.cpp	25 Aug 2004 07:30:05 -0000	2.18
@@ -435,8 +435,8 @@
 	if (ah == NULL || ah->data == NULL)
 		error("readArray: invalid array %d (%d)", array, readVar(array));
 
-	if (idx2 < 0 || idx2 > FROM_LE_32(ah->dim2end) || 
-		idx1 < 0 || idx1 > FROM_LE_32(ah->dim1end)) {
+	if (idx2 < 0 || idx2 > (int)FROM_LE_32(ah->dim2end) || 
+		idx1 < 0 || idx1 > (int)FROM_LE_32(ah->dim1end)) {
 		error("readArray: array %d out of bounds: [%d, %d] exceeds [%d..%d, %d..%d]",
 			  array, idx1, idx2, FROM_LE_32(ah->dim1start), FROM_LE_32(ah->dim1end),
 			  FROM_LE_32(ah->dim2start), FROM_LE_32(ah->dim2end));
@@ -471,8 +471,8 @@
 	if (!ah)
 		error("writeArray: Invalid array (%d) reference", readVar(array));
 
-	if (idx2 < 0 || idx2 > FROM_LE_32(ah->dim2end) || 
-		idx1 < 0 || idx1 > FROM_LE_32(ah->dim1end)) {
+	if (idx2 < 0 || idx2 > (int)FROM_LE_32(ah->dim2end) || 
+		idx1 < 0 || idx1 > (int)FROM_LE_32(ah->dim1end)) {
 		error("writeArray: array %d out of bounds: [%d, %d] exceeds [%d..%d, %d..%d]",
 			  array, idx1, idx2, FROM_LE_32(ah->dim1start), FROM_LE_32(ah->dim1end),
 			  FROM_LE_32(ah->dim2start), FROM_LE_32(ah->dim2end));





More information about the Scummvm-git-logs mailing list