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

Add fingolfin's suggested solution for bug #881132

Browse source 
svn-id: r14869
This commit is contained in:
Travis Howell 2004-09-03 00:22:31 +00:00
parent 8f6e066374
commit 077d977834
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/boxes.cpp
View file

@ -374,12 +374,10 @@ Box *ScummEngine::getBoxBaseAddr(int box) {
// checking at all. All the problems so far have been cases where // checking at all. All the problems so far have been cases where
// the value was exactly one more than what we consider the maximum. // the value was exactly one more than what we consider the maximum.
// So it's very well possible that all of these are script errors. // So it's very well possible that all of these are script errors.
if ((_gameId == GID_PASS) || ((_features & GF_OLD_BUNDLE) if (_version <= 4 && ptr[0] == box)
&& (_gameId == GID_INDY3 || _gameId == GID_ZAK))) { box--;
checkRange(ptr[0], 0, box, "Illegal box %d");
} else
checkRange(ptr[0] - 1, 0, box, "Illegal box %d");
checkRange(ptr[0] - 1, 0, box, "Illegal box %d");
if (_version <= 2) if (_version <= 2)
return (Box *)(ptr + box * SIZEOF_BOX_V2 + 1); return (Box *)(ptr + box * SIZEOF_BOX_V2 + 1);
else if (_version == 3) else if (_version == 3)