[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.257,1.258 scummvm.cpp,2.247,2.248 sound.cpp,1.137,1.138

[Jonathan Gray]

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

Modified Files:
	scumm.h scummvm.cpp sound.cpp 
Log Message:
add id for segacd monkey island and don't attempt to play sbl sounds for now

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- scumm.h	17 Jun 2003 07:11:58 -0000	1.257
+++ scumm.h	19 Jun 2003 12:29:13 -0000	1.258
@@ -208,7 +208,8 @@
 	GID_CMI,
 	GID_MANIAC,
 	GID_ZAK,
-	GID_PUTTDEMO
+	GID_PUTTDEMO,
+	GID_MONKEY_SEGA
 };
 
 #define _maxRooms res.num[rtRoom]

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.247
retrieving revision 2.248
diff -u -d -r2.247 -r2.248
--- scummvm.cpp	15 Jun 2003 01:42:15 -0000	2.247
+++ scummvm.cpp	19 Jun 2003 12:29:13 -0000	2.248
@@ -112,6 +112,8 @@
 	 GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT, 0},
 	{"monkey1", "Monkey Island 1 (alt)", GID_MONKEY, 5, VersionSettings::ADLIB_PREFERRED,
 	 GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT, 0},
+	{"game", "Monkey Island 1 (SegaCD version)", GID_MONKEY_SEGA, 5, VersionSettings::ADLIB_PREFERRED,
+	 GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT, 0},
 	{"monkey2", "Monkey Island 2: LeChuck's revenge", GID_MONKEY2, 5, VersionSettings::ADLIB_PREFERRED,
 	 GF_USE_KEY | GF_ADLIB_DEFAULT, 0},
 	{"mi2demo", "Monkey Island 2: LeChuck's revenge (Demo)", GID_MONKEY2, 5, VersionSettings::ADLIB_PREFERRED,
@@ -2500,7 +2502,7 @@
 		VAR(VAR_DEBUGMODE) = _debugMode;
 	}
 
-	if (_gameId == GID_MONKEY)
+	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
 		_scummVars[74] = 1225;
 
 	_sound->setupSound();

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- sound.cpp	15 Jun 2003 01:42:15 -0000	1.137
+++ sound.cpp	19 Jun 2003 12:29:13 -0000	1.138
@@ -282,6 +282,13 @@
 			// I'm going to assume that the sample frequency is
 			// the only important difference between the two.
 
+			// FIXME: SBL resources are apparently horribly
+			// distorted on segacd even though it shares the same
+			// header etc. So don't try to play them for now.
+			if (_scumm->_gameId == GID_MONKEY_SEGA)	{
+				return;
+			}
+	
 			if (READ_UINT32(ptr + 8) == MKID('WVhd'))
 				rate = 11025;
 			else