diff options
| author | Matthew Hoops | 2010-09-08 20:50:56 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-09-08 20:50:56 +0000 |
| commit | 0cba4f030691f83e487ddcc688214feef9a8b65e (patch) | |
| tree | 040f822b9c29f6d43d9a96e39296fd9764056dcd /engines/mohawk/myst_scripts.cpp | |
| parent | 47ad577a785aaeef7856aca883b367e9b681c4b7 (diff) | |
| download | scummvm-rg350-0cba4f030691f83e487ddcc688214feef9a8b65e.tar.gz scummvm-rg350-0cba4f030691f83e487ddcc688214feef9a8b65e.tar.bz2 scummvm-rg350-0cba4f030691f83e487ddcc688214feef9a8b65e.zip | |
MOHAWK: Implement blocking sound in Riven
Sounds that set the third argument of the playSound opcode to 1 (wherever they may be) will now block. The volume parameter of playSound is also now honored. Merge the Myst sound blocking code with this too.
svn-id: r52643
Diffstat (limited to 'engines/mohawk/myst_scripts.cpp')
| -rw-r--r-- | engines/mohawk/myst_scripts.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 29e9f349c3..bce1824a09 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -709,10 +709,7 @@ void MystScriptParser::playSoundBlocking(uint16 op, uint16 var, uint16 argc, uin debugC(kDebugScript, "Opcode %d: playSoundBlocking", op); debugC(kDebugScript, "\tsoundId: %d", soundId); - Audio::SoundHandle *handle = _vm->_sound->playSound(soundId); - - while (_vm->_mixer->isSoundHandleActive(*handle)) - _vm->_system->delayMillis(10); + _vm->_sound->playSoundBlocking(soundId); } else unknown(op, var, argc, argv); } |