Add combined speech/subtitles support for simon2 hebrew

svn-id: r9400

2 files changed, 6 insertions, 8 deletions

diff --git a/simon/items.cpp b/simon/items.cpp
index b7f5ea7f6a..dc9513431e 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1000,9 +1000,9 @@ int SimonEngine::runScript() {
 					d = _array_4[a];
 
 				if (_game & GF_SIMON2) {
-					if (d != 0 && !_subtitles)
+					if (d != 0 && (_language == 20 || !_subtitles))
 						talk_with_speech(d, b);
-					else if (s != NULL)
+					if (s != NULL && _subtitles)
 						talk_with_text(b, c, s, tv->a, tv->b, tv->c);
 				} else {
 					if (d != 0)
@@ -1304,7 +1304,7 @@ void SimonEngine::o_inventory_descriptions() {
 				}
 			}
 
-			if (!_subtitles)
+			if (_language == 20 || !_subtitles)
 				talk_with_speech(var200, a);
 		}
 
diff --git a/simon/simon.cpp b/simon/simon.cpp
index ad00b4e7ef..501deb16b1 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2079,16 +2079,14 @@ void SimonEngine::o_print_str() {
 	case GAME_SIMON2TALKIE:
 	case GAME_SIMON2WIN:
 	case GAME_SIMON2MAC:
-		if (speech_id != 0 && num_1 == 1 && !_subtitles)
+		if (speech_id != 0 && num_1 == 1 && (_language == 20 || !_subtitles))
 			talk_with_speech(speech_id, num_1);
 
-		if (speech_id != 0 && !_subtitles)
-			return;
-
 		if ((_game & GF_TALKIE) && (speech_id == 0))
 			o_kill_sprite_simon2(2, num_1 + 2);
 
-		talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
+		if (_subtitles)
+			talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
 		break;
 	}
 }