[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.344,1.345

Travis Howell kirben at users.sourceforge.net
Mon Jul 12 18:22:05 CEST 2004


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

Modified Files:
	sound.cpp 
Log Message:

Fix music in 3DO versions of HE games.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- sound.cpp	13 Jul 2004 00:22:10 -0000	1.344
+++ sound.cpp	13 Jul 2004 01:20:09 -0000	1.345
@@ -709,7 +709,7 @@
 	if (_vm->_features & GF_HUMONGOUS) {
 		if (sound == -2 || sound == 10001) {
 			return isSfxFinished();
-		} else if (sound == -1 || sound == 10000) {
+		} else if (sound == -1 || sound == 10000 || sound == _currentMusic) {
 			// getSoundStatus(), with a -1, will return the
 			// ID number of the first active music it finds.
 			// TODO handle MRAW (pcm music) in humongous games





More information about the Scummvm-git-logs mailing list