diff options
| author | Travis Howell | 2003-08-13 02:21:36 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-13 02:21:36 +0000 |
| commit | 603f8b8e3aa8128ffbc5c0cb32cd32b0105fedb5 (patch) | |
| tree | a88617c3653c11bdb93d0ab4b49b77c33db88b32 | |
| parent | 936db5deccf5ee6d92f3d9d6561685fab72701eb (diff) | |
| download | scummvm-rg350-603f8b8e3aa8128ffbc5c0cb32cd32b0105fedb5.tar.gz scummvm-rg350-603f8b8e3aa8128ffbc5c0cb32cd32b0105fedb5.tar.bz2 scummvm-rg350-603f8b8e3aa8128ffbc5c0cb32cd32b0105fedb5.zip | |
Give pass its own id
svn-id: r9654
| -rw-r--r-- | scumm/boxes.cpp | 2 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v5.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index 90c664d96a..40a5e7a2a7 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -289,7 +289,7 @@ 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) || ((_features & GF_OLD_BUNDLE) + if ((_gameId == GID_PASS) || ((_features & GF_OLD_BUNDLE) && (_gameId == GID_INDY3 || _gameId == GID_ZAK))) { checkRange(ptr[0], 0, box, "Illegal box %d"); } else diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 6f503a2677..0373c6b64f 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -592,7 +592,7 @@ void Scumm::initBGBuffers(int height) { ptr = findResourceData(MKID('SMAP'), room); gdi._numZBuffer = 0; - if (_gameId == GID_MONKEY_EGA) + if (_gameId == GID_MONKEY_EGA || _gameId == GID_PASS) off = READ_LE_UINT16(ptr); else off = READ_LE_UINT32(ptr); diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 9a7d95f8e3..11b56a4040 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -491,7 +491,7 @@ void Scumm_v5::o5_actorSet() { a->width = getVarOrDirectByte(0x80); break; case 17: /* scale */ - if ((_gameId == GID_MONKEY_VGA) || (_gameId == GID_MONKEY_EGA)) { + if ((_gameId == GID_MONKEY_VGA) || (_gameId == GID_MONKEY_EGA) || (_gameId == GID_PASS)) { a->scalex = a->scaley = getVarOrDirectByte(0x80); } else { a->scalex = getVarOrDirectByte(0x80); diff --git a/scumm/scumm.h b/scumm/scumm.h index 2d6c1c5b4d..c7d1c23a24 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -200,6 +200,7 @@ enum ScummGameId { GID_MONKEY, GID_SAMNMAX, GID_MONKEY_EGA, + GID_PASS, GID_LOOM256, GID_ZAK256, GID_INDY3, diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 46e9640604..9b15d07b29 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -87,7 +87,7 @@ static const VersionSettings scumm_settings[] = { /* Scumm Version 4 */ {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS, GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, "000.LFL"}, - {"pass", "Passport to Adventure", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS, + {"pass", "Passport to Adventure", GID_PASS, 4, VersionSettings::ADLIB_ALWAYS, GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, "000.LFL"}, /* Scumm version 5 */ |