diff options
| -rw-r--r-- | simon/simon.cpp | 6 | ||||
| -rw-r--r-- | simon/vga.cpp | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 523f13f798..56f3239148 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2019,8 +2019,7 @@ void SimonState::set_video_mode_internal(uint mode, uint vga_res_id) 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 @@ void SimonState::start_vga_code(uint b, uint vga_res, uint vga_struct_id, uint c 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; diff --git a/simon/vga.cpp b/simon/vga.cpp index bb9cf511f1..e52515804f 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -268,9 +268,7 @@ void SimonState::vc_2() _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 @@ void SimonState::vc_3() } #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() |