thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct bug in array loading from index.

Browse source 
A few changes/corrections for HE 7.2

svn-id: r14724
This commit is contained in:
Travis Howell 2004-08-24 05:04:14 +00:00
parent deeadc97fa
commit 07eb3f50f9
3 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/script_v6.cpp
View file

@ -505,9 +505,8 @@ ArrayHeader *ScummEngine_v6::getArray(int array) {
int ScummEngine_v6::readArray(int array, int idx, int base) {
ArrayHeader *ah = getArray(array);
if (ah == NULL || ah->data == NULL) {
if (ah == NULL || ah->data == NULL)
error("readArray: invalid array %d (%d)", array, readVar(array));
}
// WORKAROUND bug #645711. This is clearly a script bug, as this script
// excerpt shows nicely:
@ -565,7 +564,10 @@ void ScummEngine_v6::readArrayFromIndexFile() {
a = _fileHandle.readUint16LE();
b = _fileHandle.readUint16LE();
c = _fileHandle.readUint16LE();
defineArray(num, c, a, b);
if (c == 1)
defineArray(num, kBitArray, a, b);
else
defineArray(num, kIntArray, a, b);
}
}