aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/string.cpp5
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);
}