aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorMax Horn2003-01-12 21:13:22 +0000
committerMax Horn2003-01-12 21:13:22 +0000
commitca88dff5e7215a5556b98daec00830eb59c1f0be (patch)
treed6b0ba4bce1e087dea36069d9cffd19c975830bf /scumm/script_v6.cpp
parent2e4ba0c29f2205d6d943b81ee088d3f406c285f2 (diff)
downloadscummvm-rg350-ca88dff5e7215a5556b98daec00830eb59c1f0be.tar.gz
scummvm-rg350-ca88dff5e7215a5556b98daec00830eb59c1f0be.tar.bz2
scummvm-rg350-ca88dff5e7215a5556b98daec00830eb59c1f0be.zip
work around a script bug in COMI; cleanup; re-enabled array assert
svn-id: r6437
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 4e2deaf68a..dafe22246d 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -406,7 +406,7 @@ int Scumm::readArray(int array, int idx, int base)
// FIXME: comment this for the time being as it was causing ft to crash
// in the minefeild
- // 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];
@@ -424,12 +424,11 @@ void Scumm::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;
} else if (_features & GF_AFTER_V8) {
- // FIXME - this is just a guess, might be wrong
((uint32 *)ah->data)[base] = TO_LE_32(value);
} else {
((uint16 *)ah->data)[base] = TO_LE_16(value);