[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.370,1.371

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31016/scumm

Modified Files:
	sound.cpp 
Log Message:

Correct music skip value for HE 7.2
Play TALK sounds


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- sound.cpp	26 Aug 2004 10:51:10 -0000	1.370
+++ sound.cpp	27 Aug 2004 00:08:43 -0000	1.371
@@ -181,7 +181,7 @@
 		musicFile.seek(+40, SEEK_CUR);
 		if (musicFile.readUint32LE() == MKID('SGEN')) {
 			// Skip to correct music header
-			skip = (soundID - 4001) * 21;
+			skip = (soundID - 8001) * 21;
 			musicFile.seek(+skip, SEEK_CUR);
 
 			// Skip to offsets
@@ -260,7 +260,7 @@
 		_vm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
 	}
 	// Support for Putt-Putt sounds - very hackish, too 8-)
-	else if (READ_UINT32(ptr) == MKID('DIGI')) {
+	else if (READ_UINT32(ptr) == MKID('DIGI') || READ_UINT32(ptr) == MKID('TALK')) {
 		// TODO - discover what data the first chunk, HSHD, contains
 		// it might be useful here.
 		rate = READ_LE_UINT16(ptr + 22);