[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.76,1.77

[Joost Peters]

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

Modified Files:
	queen.cpp 
Log Message:
The Floppy version has speech in the intro. (it doesn't hurt if speechToggle is set for the floppy version)


Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- queen.cpp	15 Jan 2004 21:07:17 -0000	1.76
+++ queen.cpp	25 Jan 2004 11:47:22 -0000	1.77
@@ -122,7 +122,7 @@
 	ConfMan.registerDefault("music_mute", false);
 	ConfMan.registerDefault("sfx_mute", false);
 	ConfMan.registerDefault("talkspeed", Logic::DEFAULT_TALK_SPEED);
-	ConfMan.registerDefault("speech_mute", _resource->isFloppy());
+	ConfMan.registerDefault("speech_mute", false);
 	ConfMan.registerDefault("subtitles", true);
 }
 
@@ -136,11 +136,6 @@
 
 	// XXX check master_volume value
 
-	// only CD-ROM version has speech
-	if (_resource->isFloppy() && _sound->speechOn()) {
-		_sound->speechToggle(false);
-	}
-
 	// ensure text is always on when voice is off
 	if (!_sound->speechOn()) {
 		_subtitles = true;