[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.56,1.57 gfx.cpp,2.183,2.184 script_v5.cpp,1.148,1.149 scumm.h,1.283,1.284 scummvm.cpp,2.324,2.325

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3416/scumm

Modified Files:
	boxes.cpp gfx.cpp script_v5.cpp scumm.h scummvm.cpp 
Log Message:

Give pass its own id


Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- boxes.cpp	11 Aug 2003 00:48:32 -0000	1.56
+++ boxes.cpp	13 Aug 2003 02:21:36 -0000	1.57
@@ -289,7 +289,7 @@
 	// 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

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.183
retrieving revision 2.184
diff -u -d -r2.183 -r2.184
--- gfx.cpp	8 Aug 2003 11:32:40 -0000	2.183
+++ gfx.cpp	13 Aug 2003 02:21:36 -0000	2.184
@@ -592,7 +592,7 @@
 		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);

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- script_v5.cpp	12 Aug 2003 16:43:43 -0000	1.148
+++ script_v5.cpp	13 Aug 2003 02:21:36 -0000	1.149
@@ -491,7 +491,7 @@
 			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);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- scumm.h	11 Aug 2003 14:48:21 -0000	1.283
+++ scumm.h	13 Aug 2003 02:21:36 -0000	1.284
@@ -200,6 +200,7 @@
 	GID_MONKEY,
 	GID_SAMNMAX,
 	GID_MONKEY_EGA,
+	GID_PASS,
 	GID_LOOM256,
 	GID_ZAK256,
 	GID_INDY3,

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.324
retrieving revision 2.325
diff -u -d -r2.324 -r2.325
--- scummvm.cpp	12 Aug 2003 16:43:43 -0000	2.324
+++ scummvm.cpp	13 Aug 2003 02:21:36 -0000	2.325
@@ -87,7 +87,7 @@
 	/* 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 */