diff options
author | Max Horn | 2005-03-12 18:56:09 +0000 |
---|---|---|
committer | Max Horn | 2005-03-12 18:56:09 +0000 |
commit | 7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8 (patch) | |
tree | 7849605aa45912d9cbe65dbb68b2b450bd32b023 /simon/vga.cpp | |
parent | 8de216f3aec1dcee16fc0ab9974da4087bac5252 (diff) | |
download | scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.gz scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.bz2 scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.zip |
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
Diffstat (limited to 'simon/vga.cpp')
-rw-r--r-- | simon/vga.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/simon/vga.cpp b/simon/vga.cpp index 5ff57296a4..3f2e44a6c4 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1606,7 +1606,7 @@ void SimonEngine::vc_59() { vc_kill_sprite(file, start); } while (++start != end); } else { - if (!_sound->_voice_handle.isActive()) + if (!_mixer->isSoundHandleActive(_sound->_voice_handle)) vc_skip_next_instruction(); } } @@ -1789,7 +1789,7 @@ void SimonEngine::vc_63_palette_thing_2() { void SimonEngine::vc_64_skip_if_no_speech() { // Simon2 - if (!_sound->_voice_handle.isActive() || (_subtitles && _language != 20)) + if (!_mixer->isSoundHandleActive(_sound->_voice_handle) || (_subtitles && _language != 20)) vc_skip_next_instruction(); } |