[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.315,1.316

Max Horn fingolfin at users.sourceforge.net
Tue Feb 3 00:56:14 CET 2004


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

Modified Files:
	sound.cpp 
Log Message:
Act more gracefully when failing to load a (VOC) sound (should help bug #889442)

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- sound.cpp	20 Jan 2004 00:21:24 -0000	1.315
+++ sound.cpp	3 Feb 2004 08:53:13 -0000	1.316
@@ -830,6 +830,11 @@
 	} else {
 		input = makeVOCStream(_sfxFile);
 	}
+	
+	if (!input) {
+		warning("startSfxSound failed to load sound");
+		return 0;
+	}
 
 	if (_vm->_imuseDigital) {
 		//_vm->_imuseDigital->stopSound(kTalkSoundID);





More information about the Scummvm-git-logs mailing list