From 95552e6ee3f6539d4d3d475bf6c54510e449a531 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 9 Feb 2004 05:11:54 +0000
Subject: Switch method used for combined speech and subtitles in Simon2 (Non -
 Hebrew versions) again.

svn-id: r12782
---
 simon/simon.cpp | 5 ++++-
 simon/vga.cpp   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/simon/simon.cpp b/simon/simon.cpp
index 0705c37a19..cb3a269b1b 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -4054,7 +4054,10 @@ void SimonEngine::talk_with_speech(uint speech_id, uint vga_sprite_id) {
 			}
 			_skip_vga_wait = true;
 		} else {
-			if (_subtitles && _scriptvar_2) {
+			if (_subtitles && _language != 20) {
+				_sound->playVoice(speech_id);
+				return;
+			} else if (_subtitles && _scriptvar_2) {
 				start_vga_code(4, 2, 5, 0, 0, 0);
 				o_wait_for_vga(205);
 				o_kill_sprite_simon2(2,5);
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 2cde65f487..43468373d1 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1793,7 +1793,7 @@ void SimonEngine::vc_63_palette_thing_2() {
 
 void SimonEngine::vc_64_skip_if_no_speech() {
 	// Simon2
-	if (!_sound->_voice_handle.isActive())
+	if (!_sound->_voice_handle.isActive() || (_subtitles && _language != 20))
 		vc_skip_next_instruction();
 }
 
-- 
cgit v1.2.3