diff options
| author | Travis Howell | 2003-08-11 00:48:32 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-11 00:48:32 +0000 |
| commit | 117b7d00617f7d1d1b85840e7611d1a6e16e774c (patch) | |
| tree | d86ef1a29e879d675a7d771160ffdda259a597d5 /scumm/boxes.cpp | |
| parent | 8f88764ef04151ad9f3c8709475027269e8efa31 (diff) | |
| download | scummvm-rg350-117b7d00617f7d1d1b85840e7611d1a6e16e774c.tar.gz scummvm-rg350-117b7d00617f7d1d1b85840e7611d1a6e16e774c.tar.bz2 scummvm-rg350-117b7d00617f7d1d1b85840e7611d1a6e16e774c.zip | |
Fix regression
svn-id: r9629
Diffstat (limited to 'scumm/boxes.cpp')
| -rw-r--r-- | scumm/boxes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index 5ccba9670e..90c664d96a 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -289,8 +289,8 @@ Box *Scumm::getBoxBaseAddr(int box) { // checking at all. All the problems so far have been cases where // 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. - if ((_features & GF_OLD_BUNDLE) - && (_gameId == GID_MONKEY_EGA || _gameId == GID_INDY3 || _gameId == GID_ZAK)) { + if ((_gameId == GID_MONKEY_EGA) || ((_features & GF_OLD_BUNDLE) + && (_gameId == GID_INDY3 || _gameId == GID_ZAK))) { checkRange(ptr[0], 0, box, "Illegal box %d"); } else checkRange(ptr[0] - 1, 0, box, "Illegal box %d"); |