aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2002-11-24 13:31:38 +0000
committerTravis Howell2002-11-24 13:31:38 +0000
commit5888d9b16d4c8d725d8d0381ca12cf28394632bb (patch)
treef78992dc1f009f8da3528d5fbdfc7313d71f2775 /simon
parentba94e0ac40bb3f33ac712658a3c7114c57e84f75 (diff)
downloadscummvm-rg350-5888d9b16d4c8d725d8d0381ca12cf28394632bb.tar.gz
scummvm-rg350-5888d9b16d4c8d725d8d0381ca12cf28394632bb.tar.bz2
scummvm-rg350-5888d9b16d4c8d725d8d0381ca12cf28394632bb.zip
Disable/remove some warnings
Enable more debugging svn-id: r5709
Diffstat (limited to 'simon')
-rw-r--r--simon/midi.cpp1
-rw-r--r--simon/simon.cpp8
-rw-r--r--simon/vga.cpp4
3 files changed, 5 insertions, 8 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp
index 15d61ab74e..134c03d688 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -140,7 +140,6 @@ void MidiPlayer::read_one_song(File *in, Song *s, uint music)
break;
case 'GMF\x1':
- warning("Old style songs not properly supported yet");
read_mthd(in, s, true, music);
break;
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 3bd8cc7faa..aae65410b0 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1970,7 +1970,7 @@ void SimonState::set_video_mode_internal(uint mode, uint vga_res_id)
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 @@ 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);
-// 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 @@ 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) {
- //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;
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 738291c24e..da4f830539 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1915,8 +1915,6 @@ void SimonState::vc_70()
_vc70_var1 = a;
_vc70_var2 = b;
-
- warning("vc_70(%d,%d): music stuff?", a, b);
}
@@ -1934,8 +1932,6 @@ void SimonState::vc_72()
_vc72_var2 = b;
_vc72_var3 = a;
}
-
- warning("vc_72(%d,%d): music stuff?", a, b);
}
void SimonState::vc_73()