[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.146,1.147

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Optional subtitles in Simon 1 (unsupported)
Use subtitles by default in all except English and German versions


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- simon.cpp	29 Jan 2003 11:31:10 -0000	1.146
+++ simon.cpp	29 Jan 2003 12:48:27 -0000	1.147
@@ -3237,8 +3237,9 @@
 			break;
 
 		case 't':
-			if (_game & GAME_SIMON2)
-				_vk_t_toggle ^= 1;
+			_vk_t_toggle ^= 1;
+			if (_game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN && _vk_t_toggle)
+				warning("Many subtitles are missing in Simon 1 talkie/win data files");
 			break;
 
 		case '+':
@@ -4699,11 +4700,14 @@
 	if (_debugLevel == 4)
 		_start_mainscript = true;
 
-	if (_sound->hasVoice() && _language != 20) {
+	if (_sound->hasVoice()) {
 		_vk_t_toggle = false;
 	} else {
 		_vk_t_toggle = true;
 	}
+	//Only English and German voice files were produced
+	if  (_language >= 2)
+		_vk_t_toggle = true;
 
 	midi._midi_sfx_toggle = false;