diff options
| author | Travis Howell | 2002-11-24 13:05:44 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-11-24 13:05:44 +0000 |
| commit | f63dda7ecfca45ffc0fecc69c7315e8b1f1ffd4f (patch) | |
| tree | 4a47bee7c6ad62b1f37b01ff6e262bc978e727bf | |
| parent | 90982259101d70f561838213b6a66b36bbe01e84 (diff) | |
| download | scummvm-rg350-f63dda7ecfca45ffc0fecc69c7315e8b1f1ffd4f.tar.gz scummvm-rg350-f63dda7ecfca45ffc0fecc69c7315e8b1f1ffd4f.tar.bz2 scummvm-rg350-f63dda7ecfca45ffc0fecc69c7315e8b1f1ffd4f.zip | |
Add back changes that were reverted by mistake
svn-id: r5707
| -rw-r--r-- | simon/simon.cpp | 7 | ||||
| -rw-r--r-- | simon/vga.cpp | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index b05fd0b5ed..9883536fb0 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -4484,7 +4484,12 @@ void SimonState::go() _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(); diff --git a/simon/vga.cpp b/simon/vga.cpp index 100b51e1b4..738291c24e 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1789,12 +1789,14 @@ void SimonState::vc_62() 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_64() 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() |