[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.140,1.141

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Fri Feb 18 08:51:23 CET 2005


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18930/driver

Modified Files:
	d_sound.cpp 
Log Message:
Forgot to check if preFetchCompSpeech() could find the speech file. Now it
will work even if the file is missing. (This only affects the cutscene
player.)


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- d_sound.cpp	8 Feb 2005 08:32:50 -0000	1.140
+++ d_sound.cpp	18 Feb 2005 16:50:51 -0000	1.141
@@ -691,6 +691,9 @@
 
 	AudioStream *input = getAudioStream(&fp, "speech", _vm->_resman->whichCd(), speechId, &numSamples);
 
+	if (!input)
+		return 0;
+
 	*buf = NULL;
 
 	// Decompress data into speech buffer.





More information about the Scummvm-git-logs mailing list