[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.127,1.128

[Jonathan Gray]

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

Modified Files:
	sound.cpp 
Log Message:
don't attempt to play sound on amiga versions of zak/maniac

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- sound.cpp	26 May 2003 22:03:04 -0000	1.127
+++ sound.cpp	26 May 2003 23:23:44 -0000	1.128
@@ -391,8 +391,16 @@
 	}
 	
 	if (_scumm->_features & GF_OLD_BUNDLE) {
-		if (_scumm->_playerV2)
-			_scumm->_playerV2->startSound (soundID, ptr);
+		// FIXME: support amiga sounds
+		uint16 amigatest;
+		amigatest = READ_LE_UINT16(ptr + 12);
+		// other versions seem to be 0000 at this point...
+		// hopefully this test is correct
+		// 0xfe7f seems to be sound and 0x764a music
+		if ((amigatest != 0xfe7f) && (amigatest != 0x764a)) {
+			if (_scumm->_playerV2)
+				_scumm->_playerV2->startSound (soundID, ptr);
+		}
 		return;
 	}