ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

proper fix for the small regression caused by my COMI fix last night; this also fixes bug #766382

Browse Source 
svn-id: r9047
This commit is contained in:
Max Horn
2003-07-15 22:21:30 +00:00
parent 59346f5c9a
commit 8fbc3ed31b
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/string.cpp
+6 -6
View File
@@ -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;