diff options
| author | Max Horn | 2003-07-02 00:38:17 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-02 00:38:17 +0000 |
| commit | 33c5c72e4c1752521f2a2df0e0ffcd45ffb5264b (patch) | |
| tree | b4d9442dbbca0a5c04b2abb4216fe501e43032ee /scumm | |
| parent | fe03de724304e9e1952cb7ce05579c820bdb0396 (diff) | |
| download | scummvm-rg350-33c5c72e4c1752521f2a2df0e0ffcd45ffb5264b.tar.gz scummvm-rg350-33c5c72e4c1752521f2a2df0e0ffcd45ffb5264b.tar.bz2 scummvm-rg350-33c5c72e4c1752521f2a2df0e0ffcd45ffb5264b.zip | |
_talkChannel can legally be 0, too
svn-id: r8696
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/string.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 1f0ac6e8a7..9d7115e2f7 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -153,7 +153,7 @@ void Scumm::CHARSET_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->_talkChannel > 0)) + if ((_gameId == GID_CMI || _gameId == GID_DIG) && (_sound->_talkChannel >= 0)) return; if ((_sound->_sfxMode & 2) == 0) @@ -298,7 +298,7 @@ void Scumm::CHARSET_1() { if (_version <= 3) { _charset->printChar(c); } else { - if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannel > 0)) { + if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannel >= 0)) { // Subtitles are turned off, and there is a voice version // of this message -> don't print it. } else |