[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.100,1.101 simon.cpp,1.330,1.331 simon.h,1.98,1.99

[Travis Howell]

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

Modified Files:
	items.cpp simon.cpp simon.h 
Log Message:

Add option to switch between subtitles only and combined speech/subtitles in Simon 2.


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- items.cpp	26 Oct 2003 05:48:54 -0000	1.100
+++ items.cpp	30 Oct 2003 01:05:08 -0000	1.101
@@ -1001,7 +1001,7 @@
 				if (_game & GF_TALKIE) 
 					speech_id = _array_4[string_id];
 
-				if (speech_id != 0)
+				if (_speech && speech_id != 0)
 					talk_with_speech(speech_id, vga_struct_id);
 				if (string_ptr != NULL && _subtitles)
 					talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c);
@@ -1291,7 +1291,8 @@
 				}
 			}
 
-			talk_with_speech(var200, vga_struct_id);
+			if (_speech)
+				talk_with_speech(var200, vga_struct_id);
 		}
 
 	} else if (_game & GF_TALKIE) {

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- simon.cpp	28 Oct 2003 17:07:23 -0000	1.330
+++ simon.cpp	30 Oct 2003 01:05:08 -0000	1.331
@@ -329,6 +329,7 @@
 	_continous_mainscript = 0;
 	_continous_vgascript = 0;
 	_draw_images_debug = 0;
+	_speech = false;
 	_subtitles = true;
 	_mouse_cursor = 0;
 	_vga_var9 = 0;
@@ -2124,7 +2125,7 @@
 
 	tv = getThreeValues(vga_sprite_id);
 
-	if (speech_id != 0)
+	if (_speech && speech_id != 0)
 		talk_with_speech(speech_id, vga_sprite_id);
 	if (string_ptr != NULL && (speech_id == 0 || _subtitles))
 		talk_with_text(vga_sprite_id, color, (const char *)string_ptr, tv->a, tv->b, tv->c);
@@ -3450,9 +3451,14 @@
 			_exit_cutscene = true;
 		break;
 	case 't':
-		if (_game & GF_SIMON2 && _game & GF_TALKIE || _game & GF_TALKIE && _language > 1)
-			_subtitles ^= 1;
+		if ((_game & GF_SIMON2 && _game & GF_TALKIE) ||( _game & GF_TALKIE && _language > 1))
+			if (_speech)
+				_subtitles ^= 1;
 		break;
+	case 'v':
+		if (_game & GF_SIMON2 && _game & GF_TALKIE)
+			if (_subtitles)
+				_speech ^= 1;
 	case '+':
 		midi.set_volume(midi.get_volume() + 16);
 		break;
@@ -3479,7 +3485,7 @@
 		if (_debugMode)
 			_continous_mainscript ^= 1;
 		break;
-	case 'v':
+	case 'g':
 		if (_debugMode)
 			_continous_vgascript ^= 1;
 		break;
@@ -4695,6 +4701,7 @@
 		_start_mainscript = true;
 
 	if (_game & GF_TALKIE) {
+		_speech = true;
 		if ((_game & GF_SIMON2) || _language >= 2) {
 			if (_noSubtitles)
 				_subtitles = false;

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- simon.h	26 Oct 2003 04:35:35 -0000	1.98
+++ simon.h	30 Oct 2003 01:05:08 -0000	1.99
@@ -187,6 +187,7 @@
 	bool _continous_mainscript;
 	bool _continous_vgascript;
 	bool _draw_images_debug;
+	bool _speech;
 	bool _subtitles;
 	byte _mouse_cursor;
 	bool _vga_var9;