[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.34,1.35 script_v1.cpp,1.92,1.93 sound.cpp,1.57,1.58

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv6710

Modified Files:
	gameDetector.cpp script_v1.cpp sound.cpp 
Log Message:
Commit MI1/Indy4/etc crash fix :)



Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** gameDetector.cpp	25 Apr 2002 04:12:18 -0000	1.34
--- gameDetector.cpp	26 Apr 2002 02:53:39 -0000	1.35
***************
*** 268,272 ****
  	/* Scumm version 5 */
  	{"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA,  5, 0, 16,
! 	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT | GF_NO_SCALLING},
  	{"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42,
  	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
--- 268,272 ----
  	/* Scumm version 5 */
  	{"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA,  5, 0, 16,
! 	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
  	{"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42,
  	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
***************
*** 288,292 ****
  	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT},
  	{"samnmax", "Sam & Max", GID_SAMNMAX, 6, 4, 2,
! 	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER},
  	{"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, 3, 0,
  	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY},
--- 288,292 ----
  	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT},
  	{"samnmax", "Sam & Max", GID_SAMNMAX, 6, 4, 2,
! 	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER | GF_ADLIB_DEFAULT},
  	{"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, 3, 0,
  	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY},

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** script_v1.cpp	25 Apr 2002 04:12:18 -0000	1.92
--- script_v1.cpp	26 Apr 2002 02:53:40 -0000	1.93
***************
*** 779,783 ****
  			break;
  		case 17:										/* scale */
! 			if (_gameId & GID_MONKEY_VGA) {
  				a->scalex = a->scaley = getVarOrDirectByte(0x80);
  			} else {
--- 779,783 ----
  			break;
  		case 17:										/* scale */
! 			if (_gameId == GID_MONKEY_VGA) {
  				a->scalex = a->scaley = getVarOrDirectByte(0x80);
  			} else {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** sound.cpp	24 Apr 2002 07:19:00 -0000	1.57
--- sound.cpp	26 Apr 2002 02:53:40 -0000	1.58
***************
*** 119,123 ****
  	}
  
! 	if (_features & GF_OLD256)
  		return;											/* FIXME */
  
--- 119,123 ----
  	}
  
! 	if ((_features & GF_OLD256) || (_gameId == GID_MONKEY_VGA))
  		return;											/* FIXME */