diff options
| author | Paweł Kołodziejski | 2003-12-26 12:15:23 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-12-26 12:15:23 +0000 |
| commit | a45e92efed3715b3bb0b1191b718207b191ab1ae (patch) | |
| tree | 79e58723288257ce0e3e68a434b86f17110330d3 /scumm/string.cpp | |
| parent | 908fbe2ac563f41b039da0392baa60207331d64d (diff) | |
| download | scummvm-rg350-a45e92efed3715b3bb0b1191b718207b191ab1ae.tar.gz scummvm-rg350-a45e92efed3715b3bb0b1191b718207b191ab1ae.tar.bz2 scummvm-rg350-a45e92efed3715b3bb0b1191b718207b191ab1ae.zip | |
passthrought v7+ sound voices by imuse digital
svn-id: r11939
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 69d5ed5e6c..1a15a48255 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -163,9 +163,10 @@ void ScummEngine::CHARSET_1() { if (_talkDelay) return; - if ((_gameId == GID_CMI || _gameId == GID_DIG) && _sound->_talkChannelHandle.isActive()) { + if ((_gameId == GID_CMI || _gameId == GID_DIG) && (_imuseDigital) + && _sound->isSoundRunning(10000)) { // Keep the 'speech' flag in _sound->_sfxMode set as long as the - // _talkChannelHandle is valid. + // sound 10000 is playing. _sound->_sfxMode |= 2; } @@ -900,7 +901,7 @@ const byte *ScummEngine::translateTextAndPlaySpeech(const byte *ptr) { pointer[j] = 0; // Play speech - _imuseDigital->playBundleSound(pointer, &_sound->_talkChannelHandle); + _imuseDigital->playBundleSound(pointer); ptr = _transText; } |