[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.376,1.377

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv15860/simon

Modified Files:
	simon.cpp 
Log Message:

Add speech config option, to allow subtitles only in Simon2 again.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -d -r1.376 -r1.377
--- simon.cpp	18 Dec 2003 10:48:48 -0000	1.376
+++ simon.cpp	18 Dec 2003 11:04:02 -0000	1.377
@@ -336,7 +336,7 @@
 	_continous_vgascript = 0;
 	_draw_images_debug = 0;
 	_dump_images = 0;
-	_speech = false;
+	_speech = true;
 	_subtitles = false;
 	_fade = true;
 	_mouse_cursor = 0;
@@ -554,6 +554,9 @@
 	if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
 		_speed = ConfMan.getInt("slow_down");
 
+	if ((_game & GF_SIMON2) && ConfMan.hasKey("speech") && ConfMan.getBool("speech") == 0)
+		_speech = 0;
+
 	_system->init_size(320, 200);
 
 	// FIXME Use auto dirty rects cleanup code to reduce CPU usage
@@ -4778,7 +4781,6 @@
 		_start_mainscript = true;
 
 	if (_game & GF_TALKIE) {
-		_speech = true;
 		// English and German versions of Simon the Sorcerer 1 don't have full subtitles
 		if (!(_game & GF_SIMON2) && _language < 2) 
 			_subtitles = false;