thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method

Browse source 
svn-id: r17106
This commit is contained in:
Max Horn 2005-03-12 18:56:09 +00:00
parent 8de216f3ae
commit 7cd2cb2b17
41 changed files with 127 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

4
simon/vga.cpp
View file

@ -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();
}