[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.210,1.211

[Travis Howell]

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

Modified Files:
	sound.cpp 
Log Message:

Alter last commit, since looping would never be stopped on Mac version.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- sound.cpp	30 Aug 2003 09:15:10 -0000	1.210
+++ sound.cpp	30 Aug 2003 09:42:29 -0000	1.211
@@ -434,13 +434,15 @@
 	}
 	
 
+	// Used in Amiga verisons of indy3ega and loom
+	// Used in Mac. version of indy3ega
 	if (((_scumm->_features & GF_OLD_BUNDLE) && (_scumm->_gameId == GID_INDY3)) || ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))) {
 		if ((READ_BE_UINT16(ptr + 26) == 0x0001) || READ_BE_UINT16(ptr + 26) == 0x00FF) {
 			size = READ_BE_UINT16(ptr + 12);
 			rate = 11000;
 			sound = (char *)malloc(size);
 			memcpy(sound,ptr + READ_BE_UINT16(ptr + 8),size);
-			if (READ_BE_UINT16(ptr + 16) || READ_BE_UINT16(ptr + 6)) {
+			if ((_scumm->_features & GF_AMIGA) && (READ_BE_UINT16(ptr + 16) || READ_BE_UINT16(ptr + 6))) {
 				// the first check is for pitch-bending looped sounds (i.e. "pouring liquid", "biplane dive", etc.)
 				// the second check is for simple looped sounds
 				_scumm->_mixer->playRaw(NULL,sound,size,rate,SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP,soundID,READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8),READ_BE_UINT16(ptr + 14));
@@ -742,7 +744,7 @@
 		_scumm->_imuse->stopSound(a);
 	} else if (_scumm->_playerV2) {
 		_scumm->_playerV2->stopSound (a);
-	} else 	if (((_scumm->_features & GF_OLD_BUNDLE) && (_scumm->_gameId == GID_INDY3)) || ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3))) {
+	} else 	if ((_scumm->_features & GF_AMIGA) && (_scumm->_version == 3)) {
 		// this handles stopping looped sounds for now
 		_scumm->_mixer->stopID(a);
 	}