[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.92,1.93 vga.cpp,1.10,1.11

[Travis Howell]

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

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

Add back changes that were reverted by mistake


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- simon.cpp	24 Nov 2002 12:53:00 -0000	1.92
+++ simon.cpp	24 Nov 2002 13:05:44 -0000	1.93
@@ -4484,7 +4484,12 @@
 	
 	_mainscript_toggle = false;
 	_vgascript_toggle = false;
-	_vk_t_toggle = false;
+
+	if (!_voice) {
+		_vk_t_toggle = true;
+	} else {
+		_vk_t_toggle = false;
+	}
 
 	while (1) {
 		hitarea_stuff();

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vga.cpp	24 Nov 2002 12:53:01 -0000	1.10
+++ vga.cpp	24 Nov 2002 13:05:44 -0000	1.11
@@ -1789,12 +1789,14 @@
 
 	vc_29_stop_all_sounds();
 
-//  if (!_video_var_3) {
+	if (!_video_var_3) {
+		warning("vc_62: music stuff?");
+	}
+
 	_video_var_3 = true;
 	_video_num_pal_colors = 256;
 	if (_video_palette_mode == 4)
 		_video_num_pal_colors = 208;
-//  }
 
 	memcpy(_video_buf_1, _palette_backup, _video_num_pal_colors * sizeof(uint32));
 	for (i = NUM_PALETTE_FADEOUT; i != 0; --i) {
@@ -1861,6 +1863,14 @@
 void SimonState::vc_65()
 {																// Simon2
 	warning("vc_65 unimplemented");
+	//_palette_color_count = 0x270;
+	//_video_num_pal_colors = 0x0D0;
+	//if (_video_palette_mode != 4) {
+		//_palette_color_count = 0x300;
+		//_video_num_pal_colors = 0x100;
+	//}
+	//_palette_color_count |= 0x8000;
+	//_video_var_3 = false;
 }
 
 void SimonState::vc_66()