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

Give pass its own id

Browse source 
svn-id: r9654
This commit is contained in:
Travis Howell 2003-08-13 02:21:36 +00:00
parent 936db5decc
commit 603f8b8e3a
5 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/boxes.cpp
View file

@ -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

2
scumm/gfx.cpp
View file

@ -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);

2
scumm/script_v5.cpp
View file

@ -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);

1
scumm/scumm.h
View file

@ -200,6 +200,7 @@ enum ScummGameId {
GID_MONKEY,
GID_SAMNMAX,
GID_MONKEY_EGA,
GID_PASS,
GID_LOOM256,
GID_ZAK256,
GID_INDY3,

2
scumm/scummvm.cpp
View file

@ -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 */