[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.15,1.16 simon.cpp,1.94,1.95 vga.cpp,1.11,1.12

[Travis Howell]

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

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

Disable/remove some warnings
Enable more debugging


Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- midi.cpp	21 Nov 2002 19:26:44 -0000	1.15
+++ midi.cpp	24 Nov 2002 13:31:38 -0000	1.16
@@ -140,7 +140,6 @@
 		break;
 
 	case 'GMF\x1':
-		warning("Old style songs not properly supported yet");
 		read_mthd(in, s, true, music);
 		break;
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- simon.cpp	24 Nov 2002 13:21:31 -0000	1.94
+++ simon.cpp	24 Nov 2002 13:31:38 -0000	1.95
@@ -1970,7 +1970,7 @@
 	uint16 c;
 	byte *vc_ptr_org;
 
-	warning("Set video mode internal: %d, %d", mode, vga_res_id);
+	//warning("Set video mode internal: %d, %d", mode, vga_res_id);
 
 	_video_palette_mode = mode;
 	_lock_word |= 0x20;
@@ -2027,7 +2027,8 @@
 	vc_ptr_org = _vc_ptr;
 
 	_vc_ptr = _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->script_offs);
-//  dump_vga_script(_vc_ptr, num, vga_res_id);
+	if (_vgascript_toggle)	
+		dump_vga_script(_vc_ptr, num, vga_res_id);
 	run_vga_script();
 	_vc_ptr = vc_ptr_org;
 
@@ -3694,7 +3695,8 @@
 	for (;;) {
 		if (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->id) == vga_struct_id) {
 
-			//dump_vga_script(pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), vga_res, vga_struct_id);
+			if (_vgascript_toggle)
+				dump_vga_script(pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), vga_res, vga_struct_id);
 
 			add_vga_timer(gss->VGA_DELAY_BASE, pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs), vga_struct_id, vga_res);
 			break;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vga.cpp	24 Nov 2002 13:05:44 -0000	1.11
+++ vga.cpp	24 Nov 2002 13:31:38 -0000	1.12
@@ -1915,8 +1915,6 @@
 
 	_vc70_var1 = a;
 	_vc70_var2 = b;
-
-	warning("vc_70(%d,%d): music stuff?", a, b);
 }
 
 
@@ -1934,8 +1932,6 @@
 		_vc72_var2 = b;
 		_vc72_var3 = a;
 	}
-
-	warning("vc_72(%d,%d): music stuff?", a, b);
 }
 
 void SimonState::vc_73()