[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.393,1.394 vga.cpp,1.103,1.104

[Travis Howell]

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

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

Switch back to older method (Used in Hebrew version) of combined speech and subtitles for Simon2.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -d -r1.393 -r1.394
--- simon.cpp	21 Dec 2003 18:50:44 -0000	1.393
+++ simon.cpp	22 Dec 2003 11:08:35 -0000	1.394
@@ -565,15 +565,19 @@
 	if (!(_game & GF_SIMON2) && _language > 1) {
 		if (ConfMan.hasKey("subtitles") && ConfMan.getBool("subtitles") == 0)
 			_subtitles = 0;
-	} else if (_speech)
+	} else
 		_subtitles = ConfMan.getBool("subtitles");
 
+	// Make sure either speech or subtitles is enabled
+	if ((_game & GF_TALKIE) && !_speech && !_subtitles)
+		_subtitles = 1;
+
 	if (ConfMan.hasKey("fade") && ConfMan.getBool("fade") == 0)
 		_fade = 0;
+
 	if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
 		_speed = ConfMan.getInt("slow_down");
 
-
 	_system->init_size(320, 200);
 
 	// FIXME Use auto dirty rects cleanup code to reduce CPU usage
@@ -4070,10 +4074,12 @@
 			}
 			_skip_vga_wait = true;
 		} else {
-			if (_subtitles) {
-				_sound->playVoice(speech_id);
-				return;	
+			if (_subtitles && _scriptvar_2) {
+				start_vga_code(4, 2, 5, 0, 0, 0);
+				o_wait_for_vga(205);
+				o_kill_sprite_simon2(2,5);
 			}
+
 			o_kill_sprite_simon2(2, vga_sprite_id + 2);
 			_sound->playVoice(speech_id);
 			start_vga_code(4, 2, vga_sprite_id + 2, 0, 0, 0);

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- vga.cpp	20 Dec 2003 07:59:42 -0000	1.103
+++ vga.cpp	22 Dec 2003 11:08:35 -0000	1.104
@@ -1785,7 +1785,7 @@
 
 void SimonEngine::vc_64_skip_if_no_speech() {
 	// Simon2
-	if ((_sound->_voice_handle == 0) || _subtitles)
+	if (_sound->_voice_handle == 0)
 		vc_skip_next_instruction();
 }