diff options
| author | Max Horn | 2003-07-15 22:21:30 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-15 22:21:30 +0000 |
| commit | 8fbc3ed31bf6c8db9a1667779ffd88e4cba3c174 (patch) | |
| tree | 62a4ff51698598173b67223be7e0a1d85a1ee6a5 /scumm/string.cpp | |
| parent | 59346f5c9abb45182e408348f525c23a387f5eab (diff) | |
| download | scummvm-rg350-8fbc3ed31bf6c8db9a1667779ffd88e4cba3c174.tar.gz scummvm-rg350-8fbc3ed31bf6c8db9a1667779ffd88e4cba3c174.tar.bz2 scummvm-rg350-8fbc3ed31bf6c8db9a1667779ffd88e4cba3c174.zip | |
proper fix for the small regression caused by my COMI fix last night; this also fixes bug #766382
svn-id: r9047
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index ebd6baef17..167d3e4ea2 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -149,13 +149,13 @@ void Scumm::CHARSET_1() { if (_talkDelay) return; - if (_haveMsg == 1) { - // FIXME: DIG and CMI never set sfxMode or any actor talk data... - // This hack will force the backup cutoff system to be used instead, - // unless the talkChannel is null (eg, this string has no sound attached) - if ((_gameId == GID_CMI || _gameId == GID_DIG) && _sound->_talkChannelHandle) - return; + if ((_gameId == GID_CMI || _gameId == GID_DIG) && _sound->_talkChannelHandle) { + // Keep the 'speech' flag in _sound->_sfxMode set as long as the + // _talkChannelHandle is valid. + _sound->_sfxMode |= 2; + } + if (_haveMsg == 1) { if ((_sound->_sfxMode & 2) == 0) stopTalk(); return; |