[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.100,1.101 vga.cpp,1.16,1.17
Travis Howell
kirben at users.sourceforge.net
Fri Nov 29 01:10:03 CET 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv28793/simon
Modified Files:
simon.cpp vga.cpp
Log Message:
Disable extra debug output again since it causes crashes when viewing debug output
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- simon.cpp 28 Nov 2002 05:52:55 -0000 1.100
+++ simon.cpp 29 Nov 2002 09:09:35 -0000 1.101
@@ -2019,8 +2019,7 @@
vc_ptr_org = _vc_ptr;
_vc_ptr = _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->script_offs);
- if (_vgascript_toggle)
- dump_vga_script(_vc_ptr, num, vga_res_id);
+ //dump_vga_script(_vc_ptr, num, vga_res_id);
run_vga_script();
_vc_ptr = vc_ptr_org;
@@ -3687,8 +3686,7 @@
for (;;) {
if (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->id) == vga_struct_id) {
- if (_vgascript_toggle)
- dump_vga_script(pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), vga_res, vga_struct_id);
+ //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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- vga.cpp 28 Nov 2002 05:52:55 -0000 1.16
+++ vga.cpp 29 Nov 2002 09:09:35 -0000 1.17
@@ -268,9 +268,7 @@
_vc_ptr = _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->script_offs);
-
- if (_vgascript_toggle)
- dump_vga_script(_vc_ptr, res, num);
+ //dump_vga_script(_vc_ptr, res, num);
run_vga_script();
_cur_vga_file_1 = old_file_1;
@@ -359,12 +357,9 @@
}
#endif
- if (_vgascript_toggle)
- dump_vga_script(_cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), res, b);
+ //dump_vga_script(_cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), res, b);
- add_vga_timer(gss->VGA_DELAY_BASE,
- _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs),
- b, res);
+ add_vga_timer(gss->VGA_DELAY_BASE, _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs), b, res);
}
void SimonState::vc_4()
More information about the Scummvm-git-logs
mailing list