From 11411767758dda1b7341c28e085064ee13c32c7b Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 16 Jan 2004 13:01:33 +0000
Subject: Revert last array change, until they can be verified.

svn-id: r12432
---
 scumm/akos.cpp      | 2 +-
 scumm/script_v6.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index be9aeec068..d3af4ee874 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -1252,7 +1252,7 @@ bool ScummEngine::akos_increaseAnim(Actor *a, int chan, const byte *aksq, const
 			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;
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 722afbcccd..235cd20c25 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -411,7 +411,7 @@ int ScummEngine::readArray(int array, int idx, int base) {
 	// 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 @@ void ScummEngine::writeArray(int array, int idx, int base, int value) {
 		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;
-- 
cgit v1.2.3