[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.430,1.431

kirben kirben at users.sourceforge.net
Sat Mar 12 22:07:42 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12426/scumm

Modified Files:
	sound.cpp 
Log Message:

Fix spyozon regression


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -d -r1.430 -r1.431
--- sound.cpp	12 Mar 2005 18:55:42 -0000	1.430
+++ sound.cpp	13 Mar 2005 06:07:25 -0000	1.431
@@ -815,7 +815,7 @@
 
 	if (_vm->_features & GF_HUMONGOUS) {
 		if (sound == -2) {
-			return -1;
+			return !isSfxFinished();
 		} else if (sound == -1) {
 			// getSoundStatus(), with a -1, will return the
 			// ID number of the first active music it finds.
@@ -828,6 +828,8 @@
 			// channel = sound - 10000
 			if (sound == 10000)
 				return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0);
+			else if (sound == 10001)
+				return _vm->_mixer->isSoundHandleActive(_talkChannelHandle);
 			else
 				return 0;
 		}





More information about the Scummvm-git-logs mailing list