diff options
Diffstat (limited to 'simon/vga.cpp')
| -rw-r--r-- | simon/vga.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/simon/vga.cpp b/simon/vga.cpp index d687820f35..100b51e1b4 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1343,8 +1343,7 @@ void SimonState::vc_28() void SimonState::vc_29_stop_all_sounds() { - _mixer->stopAll(); - _ambient_playing = 0; + _sound->stopAll(); } void SimonState::vc_30_set_base_delay() @@ -1604,13 +1603,13 @@ void SimonState::vc_52() uint16 a = vc_read_next_word(); if (!(_game & GAME_SIMON2)) { - playEffects(a); + _sound->playEffects(a); } else { if (a >= 0x8000) { a = -a; - playAmbient(a); + _sound->playAmbient(a); } else { - playEffects(a); + _sound->playEffects(a); } } } @@ -1790,14 +1789,12 @@ void SimonState::vc_62() vc_29_stop_all_sounds(); - if (!_video_var_3) { - warning("vc_62: music stuff?"); - } - +// if (!_video_var_3) { _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) { @@ -1864,14 +1861,6 @@ 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() |