[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.389,1.390

[Travis Howell]

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

Modified Files:
	sound.cpp 
Log Message:

Ooops


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -d -r1.389 -r1.390
--- sound.cpp	15 Sep 2004 11:56:07 -0000	1.389
+++ sound.cpp	15 Sep 2004 12:12:43 -0000	1.390
@@ -166,7 +166,7 @@
 		debug(0, "playSound #%d", soundID);
 
 		int music_offs, total_size;
-		uint tunes, skip = 0;
+		uint tracks, skip = 0;
 		char buf[32];
 		File musicFile;
 
@@ -178,16 +178,16 @@
 		musicFile.seek(4, SEEK_SET);
 		total_size = musicFile.readUint32BE();
 		musicFile.seek(+8, SEEK_CUR);
-		tunes = musicFile.readUint32LE();
+		tracks = musicFile.readUint32LE();
 
 		if (soundID >= 8500)
 			skip = (soundID - 8500);
-		if (soundID >= 8000)
+		else if (soundID >= 8000)
 			skip = (soundID - 8000);
 		else if	(soundID >= 4000)
 			skip = (soundID - 4000);
 		
-		if (skip > tunes)
+		if (skip > tracks)
 			skip = 0;
 
 		musicFile.seek(+28, SEEK_CUR);
@@ -242,11 +242,10 @@
 		return;
 	}
 
-	Common::hexdump(ptr, 0x30);
 	// Support for SFX in Monkey Island 1, Mac version
 	// This is rather hackish right now, but works OK. SFX are not sounding
 	// 100% correct, though, not sure right now what is causing this.
-	if (READ_UINT32(ptr) == MKID('Mac1')) {
+	else if (READ_UINT32(ptr) == MKID('Mac1')) {
 
 		// Read info from the header
 		size = READ_BE_UINT32(ptr+0x60);