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

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


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

Modified Files:
      Tag: branch-0-7-0
	d_sound.cpp 
Log Message:
Backported fix to allow the cutscene player to run without speech files.


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.129.2.1
retrieving revision 1.129.2.2
diff -u -d -r1.129.2.1 -r1.129.2.2
--- d_sound.cpp	7 Feb 2005 10:24:04 -0000	1.129.2.1
+++ d_sound.cpp	18 Feb 2005 16:57:24 -0000	1.129.2.2
@@ -902,6 +902,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