[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.419,1.420 vga.cpp,1.113,1.114

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8130/simon

Modified Files:
	simon.cpp vga.cpp 
Log Message:

Switch method used for combined speech and subtitles in Simon2 (Non - Hebrew versions) again.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -d -r1.419 -r1.420
--- simon.cpp	5 Feb 2004 00:19:56 -0000	1.419
+++ simon.cpp	9 Feb 2004 05:11:50 -0000	1.420
@@ -4054,7 +4054,10 @@
 			}
 			_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);

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- vga.cpp	30 Jan 2004 03:26:47 -0000	1.113
+++ vga.cpp	9 Feb 2004 05:11:54 -0000	1.114
@@ -1793,7 +1793,7 @@
 
 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();
 }