[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.103,1.104 script_v6.cpp,1.273,1.274

[Travis Howell]

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

Modified Files:
	akos.cpp script_v6.cpp 
Log Message:

Revert last array change, until they can be verified.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- akos.cpp	16 Jan 2004 06:16:38 -0000	1.103
+++ akos.cpp	16 Jan 2004 13:01:32 -0000	1.104
@@ -1252,7 +1252,7 @@
 			if (akfo == NULL)
 				error("akos_increaseAnim: no AKFO table");
 			tmp = a->getAnimVar(GB(2)) - 1;
-			if (tmp < 0 || tmp > numakfo - 1)
+			if (tmp < 0 || tmp >= numakfo - 1)
 				error("akos_increaseAnim: invalid jump value %d", tmp);
 			curpos = READ_LE_UINT16(&akfo[tmp]);
 			break;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- script_v6.cpp	16 Jan 2004 10:45:56 -0000	1.273
+++ script_v6.cpp	16 Jan 2004 13:01:33 -0000	1.274
@@ -411,7 +411,7 @@
 	// FIX THE FIXME: fixing an assert by commenting out is bad. It's evil.
 	// It's wrong. Find the proper cause, or at least, silently return
 	// from the function, but don't just go on overwriting memory!
-	assert(base >= 0 && base <= ah->dim1_size * ah->dim2_size);
+	assert(base >= 0 && base < ah->dim1_size * ah->dim2_size);
 
 	if (ah->type == 4) {
 		return ah->data[base];
@@ -428,7 +428,7 @@
 		return;
 	base += idx * ah->dim1_size;
 
-	assert(base >= 0 && base <= ah->dim1_size * ah->dim2_size);
+	assert(base >= 0 && base < ah->dim1_size * ah->dim2_size);
 
 	if (ah->type == 4) {
 		ah->data[base] = value;