[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.10,1.11

Joost Peters joostp at users.sourceforge.net
Tue Aug 26 17:52:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv5954/bs2/driver

Modified Files:
	d_sound.cpp 
Log Message:
errr. this shouldn't have been committed

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- d_sound.cpp	27 Aug 2003 00:36:01 -0000	1.10
+++ d_sound.cpp	27 Aug 2003 00:48:55 -0000	1.11
@@ -992,11 +992,9 @@
 
 	    //  Open the speech cluster and find the data offset & size
 		fp = fopen(filename, "rb");
-		if (fp == NULL) {
-			error("PlayCompSpeech()");
+		if (fp == NULL) 
 			return(RDERR_INVALIDFILENAME);
-		}
-
+		
 		if (fseek(fp, (++speechid) * 8, SEEK_SET))
 		{
 			fclose(fp);
@@ -1116,7 +1114,7 @@
 //			IDirectSoundBuffer_Play(dsbSpeech, 0, 0, 0);
 			
 			uint32 flags = SoundMixer::FLAG_16BITS;
-                        flags |= SoundMixer::FLAG_AUTOFREE;
+			flags |= SoundMixer::FLAG_AUTOFREE;
 
 			//Until the mixer supports LE samples natively, we need to convert our LE ones to BE
 			for (uint j = 0; j < (bufferSize / 2); j++)





More information about the Scummvm-git-logs mailing list