[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.286,1.287

Max Horn fingolfin at users.sourceforge.net
Mon Dec 22 12:29:02 CET 2003


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

Modified Files:
	sound.cpp 
Log Message:
actually, converting a sound handle to a sound index is an evil hack, too... :-)

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- sound.cpp	22 Dec 2003 08:22:03 -0000	1.286
+++ sound.cpp	22 Dec 2003 20:28:27 -0000	1.287
@@ -534,7 +534,7 @@
 	// HACK: Checking for script 99 in Sam & Max is to keep Conroy's song
 	// from being interrupted.
 
-	int talkChannel = (_talkChannelHandle - 1);
+	int talkChannel = (_talkChannelHandle - 1);	// EVIL HACK!!!
 	if (mode == 1 && (_scumm->_gameId == GID_TENTACLE
 		|| (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) {
 		for (i = 0; i < SoundMixer::NUM_CHANNELS; i++) {





More information about the Scummvm-git-logs mailing list