[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.44,1.45

Joost Peters joostp at users.sourceforge.net
Fri Oct 1 07:49:02 CEST 2004


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

Modified Files:
	sound.cpp 
Log Message:
Use the SilentSound class for sfx/speech when sound output is not possible.
This should fix the hangs where the game waits for sfx/speech to finish in these cases.



Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- sound.cpp	24 Aug 2004 16:31:45 -0000	1.44
+++ sound.cpp	1 Oct 2004 14:48:49 -0000	1.45
@@ -40,6 +40,9 @@
 }
 
 Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
+	if (!mixer->isReady())
+		return new SilentSound(mixer, vm);
+	
 	switch(compression) {
 		case COMPRESSION_NONE:
 				return new SBSound(mixer, vm);





More information about the Scummvm-git-logs mailing list