aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-01-16 13:01:33 +0000
committerTravis Howell2004-01-16 13:01:33 +0000
commit11411767758dda1b7341c28e085064ee13c32c7b (patch)
treea86a23a8c180cc7d0a44002a19773ad55ae3c6fb /scumm/script_v6.cpp
parent9a8aac9e63144f9f2658b925c98c901ad0d842d3 (diff)
downloadscummvm-rg350-11411767758dda1b7341c28e085064ee13c32c7b.tar.gz
scummvm-rg350-11411767758dda1b7341c28e085064ee13c32c7b.tar.bz2
scummvm-rg350-11411767758dda1b7341c28e085064ee13c32c7b.zip
Revert last array change, until they can be verified.
svn-id: r12432
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp4
1 files changed, 2 insertions, 2 deletions
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;