[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.256,1.257

Jamieson Christian jamieson630 at users.sourceforge.net
Tue Sep 30 09:47:04 CEST 2003


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

Modified Files:
	sound.cpp 
Log Message:
This may be an issue in legit gameplay, but GF_FMTOWNS
games do use _musicEngine for the FM synth stuff, so
don't exclude it in stopSound(). (Is this assumption
made elsewhere also?)

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- sound.cpp	27 Sep 2003 20:31:19 -0000	1.256
+++ sound.cpp	30 Sep 2003 16:45:50 -0000	1.257
@@ -702,11 +702,10 @@
 		stopCDTimer();
 	}
 
-	if (_scumm->_features & GF_FMTOWNS) {
+	if (_scumm->_features & GF_FMTOWNS)
 		_scumm->_mixer->stopID(a);
-	} else if (_scumm->_musicEngine) {
+	if (_scumm->_musicEngine)
 		_scumm->_musicEngine->stopSound(a);
-	}
 
 	for (i = 0; i < 10; i++)
 		if (_soundQue2[i] == a)





More information about the Scummvm-git-logs mailing list