[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.406,1.407

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Subtitles check wasn't quite right.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -d -r1.406 -r1.407
--- simon.cpp	31 Dec 2003 02:43:51 -0000	1.406
+++ simon.cpp	1 Jan 2004 06:29:27 -0000	1.407
@@ -354,7 +354,7 @@
 	_draw_images_debug = 0;
 	_dump_images = 0;
 	_speech = true;
-	_subtitles = false;
+	_subtitles = true;
 	_fade = true;
 	_mouse_cursor = 0;
 	_vga_var9 = 0;
@@ -576,7 +576,7 @@
 	if ((_game & GF_SIMON2) && ConfMan.hasKey("speech_mute") && ConfMan.getBool("speech_mute") == 1)
 		_speech = 0;
 
-	if (!(_game & GF_SIMON2) && _language > 1) {
+	if ((!(_game & GF_SIMON2) && _language > 1) || ((_game & GF_SIMON2) && _language == 20)) {
 		if (ConfMan.hasKey("subtitles") && ConfMan.getBool("subtitles") == 0)
 			_subtitles = 0;
 	} else