diff options
| author | Max Horn | 2003-06-09 00:51:09 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-09 00:51:09 +0000 |
| commit | 54e4ac9746f97dc311ae2001c70a38c10d68bc7d (patch) | |
| tree | 3cc38f29ea19efb82bb5d3ae25f4244f63fd19fc /scumm | |
| parent | c04f39304b2a45ed645b9a9a9151c7d278bebaab (diff) | |
| download | scummvm-rg350-54e4ac9746f97dc311ae2001c70a38c10d68bc7d.tar.gz scummvm-rg350-54e4ac9746f97dc311ae2001c70a38c10d68bc7d.tar.bz2 scummvm-rg350-54e4ac9746f97dc311ae2001c70a38c10d68bc7d.zip | |
better (proper? hm...) code to deal with turning of subtitles in V7/V8 games
svn-id: r8407
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/string.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index dc9ad79c2e..9006d90b0d 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -302,7 +302,10 @@ void Scumm::CHARSET_1() { if (_version <= 3) { _charset->printChar(c); } else { - if (!_noSubtitles || _haveMsg != 0xFE) + 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 _charset->printChar(c); } |