diff options
| author | James Brown | 2002-12-29 01:21:58 +0000 |
|---|---|---|
| committer | James Brown | 2002-12-29 01:21:58 +0000 |
| commit | c8de10cbc525e60249bfad82ef39d55b8d0aec30 (patch) | |
| tree | 8a7e43e0eeb4f0b52eca39eae7caecbfa9495753 /scumm/string.cpp | |
| parent | 24229f820a22a939295a4de7f139ff63537abc4b (diff) | |
| download | scummvm-rg350-c8de10cbc525e60249bfad82ef39d55b8d0aec30.tar.gz scummvm-rg350-c8de10cbc525e60249bfad82ef39d55b8d0aec30.tar.bz2 scummvm-rg350-c8de10cbc525e60249bfad82ef39d55b8d0aec30.zip | |
fix cutoff hack workaround
svn-id: r6245
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 7d238859c7..8ba5574569 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -164,6 +164,12 @@ void Scumm::CHARSET_1() return; if (_haveMsg != 0xFF && _haveMsg != 0xFE) { + // 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->_talkChannel > 0)) + return; + if (_sound->_sfxMode == 0) stopTalk(); return; |