diff options
| author | Travis Howell | 2003-12-02 05:12:49 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-12-02 05:12:49 +0000 |
| commit | 528fd63a0754e06b3f5c52159d5423ff96a501b5 (patch) | |
| tree | cbd440ee8547af728f0b0deaf2606fb4a8c47456 | |
| parent | 1706fefb6e4d54bf18eda47cb07840e47ea229de (diff) | |
| download | scummvm-rg350-528fd63a0754e06b3f5c52159d5423ff96a501b5.tar.gz scummvm-rg350-528fd63a0754e06b3f5c52159d5423ff96a501b5.tar.bz2 scummvm-rg350-528fd63a0754e06b3f5c52159d5423ff96a501b5.zip | |
Only used in simon1win
svn-id: r11454
| -rw-r--r-- | simon/vga.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/simon/vga.cpp b/simon/vga.cpp index a24fc57656..d645f6d28e 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1705,7 +1705,6 @@ void SimonEngine::vc_61_sprite_change() { void SimonEngine::vc_62_palette_thing() { uint i; - byte *vc_ptr_org = _vc_ptr; vc_29_stop_all_sounds(); @@ -1724,10 +1723,11 @@ void SimonEngine::vc_62_palette_thing() { delay(5); } - if (!(_game & GF_SIMON2)) { + if (_game == GAME_SIMON1WIN) { uint16 params[5]; /* parameters to vc_10_draw */ VgaSprite *vsp; VgaPointersEntry *vpe; + byte *vc_ptr_org = _vc_ptr; vsp = _vga_sprites; while (vsp->id != 0) { @@ -1756,11 +1756,10 @@ void SimonEngine::vc_62_palette_thing() { } vsp++; } + _vc_ptr = vc_ptr_org; } dx_clear_surfaces(_video_palette_mode == 4 ? 134 : 200); - - _vc_ptr = vc_ptr_org; } if (_game & GF_SIMON2) { if (_next_music_to_play != -1) @@ -1785,11 +1784,11 @@ void SimonEngine::vc_64_skip_if_no_speech() { void SimonEngine::vc_65_palette_thing_3() { // Simon2 - _palette_color_count = 0x270; - _video_num_pal_colors = 0x0D0; + _palette_color_count = 624; + _video_num_pal_colors = 208; if (_video_palette_mode != 4) { - _palette_color_count = 0x300; - _video_num_pal_colors = 0x100; + _palette_color_count = 768; + _video_num_pal_colors = 256; } _palette_color_count |= 0x8000; _video_var_3 = false; |