[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.416,1.417

[kirben]

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

Modified Files:
	sound.cpp 
Log Message:

Music regression in some HE games.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -d -r1.416 -r1.417
--- sound.cpp	30 Jan 2005 05:34:04 -0000	1.416
+++ sound.cpp	30 Jan 2005 09:11:38 -0000	1.417
@@ -821,11 +821,9 @@
 			// getSoundStatus(), with a -1, will return the
 			// ID number of the first active music it finds.
 			if (_vm->_heversion >= 70 || _currentMusic)
-				return (_musicChannelHandle.isActive()) ? 1 : 0;
+				return (_musicChannelHandle.isActive());
 			else if (_vm->_imuse)
 				return (_vm->_imuse->getSoundStatus(sound));
-		} else if (sound > _vm->_numSounds) {
-			return _vm->_mixer->isSoundIDActive(sound);
 		}
 	}
 
@@ -835,7 +833,7 @@
 	if (isSoundInQueue(sound))
 		return 1;
 
-	if (!_vm->isResourceLoaded(rtSound, sound))
+	if (sound > _vm->_numSounds || !_vm->isResourceLoaded(rtSound, sound))
 		return 0;
 
 	if (_vm->_musicEngine)