[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.35,1.35.2.1

[Joost Peters]

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

Modified Files:
      Tag: branch-0-6-0
	sound.cpp 
Log Message:
Fix bug #899881 in 0-6-0 branch as well


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -d -r1.35 -r1.35.2.1
--- sound.cpp	25 Jan 2004 22:10:23 -0000	1.35
+++ sound.cpp	21 Feb 2004 20:51:32 -0000	1.35.2.1
@@ -77,6 +77,9 @@
 }
 
 void Sound::playSfx(uint16 sfx, bool isSpeech) {
+	if (isSpeech && !speechOn()) return;
+	else if (!sfxOn()) return;
+
 	if (sfx != 0) {
 		char name[13];
 		strcpy(name, _sfxName[sfx - 1]);
@@ -87,6 +90,9 @@
 }
 
 void Sound::playSfx(const char *base, bool isSpeech) {
+	if (isSpeech && !speechOn()) return;
+	else if (!sfxOn()) return;
+	
 	char name[13];
 	strcpy(name, base);
 	// alter filename to add zeros and append ".SB"