[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.39,1.40

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv16261/scumm

Modified Files:
	sound.cpp 
Log Message:
Patch 622642


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- sound.cpp	21 Oct 2002 13:23:24 -0000	1.39
+++ sound.cpp	21 Oct 2002 16:27:23 -0000	1.40
@@ -474,10 +474,14 @@
 	// Some games frequently assume that starting one sound effect will
 	// automatically stop any other that may be playing at that time. So
 	// that is what we do here, but we make an exception for speech.
-	// 
+	//
 	// Do any other games than these need this hack?
+	//
+	// HACK: Checking for script 99 in Sam & Max is to keep Conroy's song
+	// from being interrupted.
 
-	if (mode == 1 && (_scumm->_gameId == GID_TENTACLE || _scumm->_gameId == GID_SAMNMAX)) {
+	if (mode == 1 && (_scumm->_gameId == GID_TENTACLE
+		|| (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) {
 		for (int i = 0; i < _scumm->_mixer->NUM_CHANNELS; i++) {
 			if (i != _talkChannel)
 				_scumm->_mixer->stop(i);