diff options
| author | Max Horn | 2003-08-06 12:04:27 +0000 |
|---|---|---|
| committer | Max Horn | 2003-08-06 12:04:27 +0000 |
| commit | 3e0cd37cea291a06b510228b4c26cf40db80140f (patch) | |
| tree | e9a722226f90d96b21158b5f0160ef7af10bdcfe /scumm/boxes.cpp | |
| parent | 845a3c5f6e7d98ee223be5703aa0312d7b37ee2e (diff) | |
| download | scummvm-rg350-3e0cd37cea291a06b510228b4c26cf40db80140f.tar.gz scummvm-rg350-3e0cd37cea291a06b510228b4c26cf40db80140f.tar.bz2 scummvm-rg350-3e0cd37cea291a06b510228b4c26cf40db80140f.zip | |
get rid of GF_INDY3 again, and also remove GID_INDY3_256 and GID_INDY3_TOWNS
svn-id: r9554
Diffstat (limited to 'scumm/boxes.cpp')
| -rw-r--r-- | scumm/boxes.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index 0342288832..5ccba9670e 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -289,7 +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 (_gameId == GID_MONKEY_EGA || _gameId == GID_INDY3 || _gameId == GID_ZAK) { + if ((_features & GF_OLD_BUNDLE) + && (_gameId == GID_MONKEY_EGA || _gameId == GID_INDY3 || _gameId == GID_ZAK)) { checkRange(ptr[0], 0, box, "Illegal box %d"); } else checkRange(ptr[0] - 1, 0, box, "Illegal box %d"); @@ -657,7 +658,7 @@ int Scumm::getPathToDestBox(byte from, byte to) { // case to fix the scene in Indy3 where Indy meets Hitler in Berlin. // It's one of the places (or maybe even the only one?). See bug #770690 // and also bug #774783. - if ((_features & GF_INDY3) && _roomResource == 46 && from == 1 && to == 0) + if ((_gameId == GID_INDY3) && _roomResource == 46 && from == 1 && to == 0) return 1; // Skip up to the matrix data for box 'from' |