diff options
| author | Travis Howell | 2002-11-28 05:52:55 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-11-28 05:52:55 +0000 |
| commit | 66c6879d451ef0a0e29911847a1e8eabae1186ce (patch) | |
| tree | ddacd5f8f043e1bdc068f5a3c60d095916215f22 /simon | |
| parent | b6a70f4a478eb8c21ad73dab289993ff945d5264 (diff) | |
| download | scummvm-rg350-66c6879d451ef0a0e29911847a1e8eabae1186ce.tar.gz scummvm-rg350-66c6879d451ef0a0e29911847a1e8eabae1186ce.tar.bz2 scummvm-rg350-66c6879d451ef0a0e29911847a1e8eabae1186ce.zip | |
Add work around to allow vc_65 to be enabled
svn-id: r5735
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 6 | ||||
| -rw-r--r-- | simon/vga.cpp | 17 |
2 files changed, 12 insertions, 11 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index e7984df483..523f13f798 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -4428,13 +4428,15 @@ void SimonState::dx_update_screen_and_palette() void SimonState::realizePalette() { if (_palette_color_count & 0x8000) { - error("_palette_color_count&0x8000"); - } + warning("realizePalette subroutine unimplemented"); + _palette_color_count = 0; + } else { _video_var_9 = false; memcpy(_palette_backup, _palette, 256 * 4); _system->set_palette(_palette, 0, _palette_color_count); _palette_color_count = 0; + } } diff --git a/simon/vga.cpp b/simon/vga.cpp index 2c1462f9d8..bb9cf511f1 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1864,15 +1864,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; + _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() |