[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.342,1.343

Travis Howell kirben at users.sourceforge.net
Mon Jul 12 07:22:00 CEST 2004


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

Modified Files:
	sound.cpp 
Log Message:

Correction


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -d -r1.342 -r1.343
--- sound.cpp	12 Jul 2004 13:22:48 -0000	1.342
+++ sound.cpp	12 Jul 2004 14:21:16 -0000	1.343
@@ -715,7 +715,7 @@
 			// ID number of the first active music it finds.
 			// TODO handle MRAW (pcm music) in humongous games
 			if (_currentMusic)
-				return _currentMusic;
+				return (_musicChannelHandle.isActive()) ? _currentMusic : 0;
 			else
 				return _vm->_imuse->getSoundStatus(sound);
 		}





More information about the Scummvm-git-logs mailing list