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

[Travis Howell]

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

Modified Files:
	sound.cpp 
Log Message:

Stop music when requested in HE games.
Fix sfx status for HE games.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -d -r1.345 -r1.346
--- sound.cpp	13 Jul 2004 01:20:09 -0000	1.345
+++ sound.cpp	13 Jul 2004 01:40:47 -0000	1.346
@@ -708,7 +708,7 @@
 
 	if (_vm->_features & GF_HUMONGOUS) {
 		if (sound == -2 || sound == 10001) {
-			return isSfxFinished();
+			return !isSfxFinished();
 		} else if (sound == -1 || sound == 10000 || sound == _currentMusic) {
 			// getSoundStatus(), with a -1, will return the
 			// ID number of the first active music it finds.
@@ -793,6 +793,10 @@
 			// Stop current sfx
 		} else if (a == -1 || a == 10000) {
 			// Stop current music
+			if (_currentMusic)
+				_vm->_mixer->stopID(_currentMusic);
+			else if (_vm->_imuse)
+				_vm->_imuse->stopSound(_vm->_imuse->getSoundStatus(-1));
 		}
 	}