[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.381,1.382

Travis Howell kirben at users.sourceforge.net
Sat Sep 4 02:27:01 CEST 2004


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

Modified Files:
	sound.cpp 
Log Message:

Should use _numSounds too.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- sound.cpp	2 Sep 2004 07:00:57 -0000	1.381
+++ sound.cpp	4 Sep 2004 09:26:08 -0000	1.382
@@ -88,8 +88,8 @@
 
 void Sound::addSoundToQueue(int sound, int offset) {
 	_vm->VAR(_vm->VAR_LAST_SOUND) = sound;
-	// Music resources are in separate file
-	if (!((_vm->_heversion >= 70) && sound >= 4000))
+	// HE music resources are in separate file
+	if (sound <= _vm->_numSounds)
 		_vm->ensureResourceLoaded(rtSound, sound);
 	addSoundToQueue2(sound, offset);
 }





More information about the Scummvm-git-logs mailing list