From 32be9261fc742cef7792b112e585abdfe699f5af Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 29 Jan 2003 12:48:27 +0000
Subject: Optional subtitles in Simon 1 (unsupported) Use subtitles by default
 in all except English and German versions

svn-id: r6572
---
 simon/simon.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/simon/simon.cpp b/simon/simon.cpp
index 4df2a18b10..c0f55bb670 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -3237,8 +3237,9 @@ void SimonState::processSpecialKeys()
 			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 @@ void SimonState::go()
 	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;
 	
-- 
cgit v1.2.3