aboutsummaryrefslogtreecommitdiff
path: root/scumm/string.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-08-28 10:00:49 +0000
committerTravis Howell2003-08-28 10:00:49 +0000
commit906c7818ece3325a093ac6fc3a3325452723ee39 (patch)
tree72562fd1cdd9a07f209c4d4be9f2176619d4b31c /scumm/string.cpp
parent6071e79dcecee386426b216db75fa0de38be85a0 (diff)
downloadscummvm-rg350-906c7818ece3325a093ac6fc3a3325452723ee39.tar.gz
scummvm-rg350-906c7818ece3325a093ac6fc3a3325452723ee39.tar.bz2
scummvm-rg350-906c7818ece3325a093ac6fc3a3325452723ee39.zip
Fix regression that caused subtitles to always be shown in loomcd
svn-id: r9888
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r--scumm/string.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 2697455bf3..75dd18b0a7 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -310,7 +310,7 @@ void Scumm::CHARSET_1() {
if (_version <= 3) {
_charset->printChar(c);
} else {
- if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) {
+ if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle >= 0)) {
// Subtitles are turned off, and there is a voice version
// of this message -> don't print it.
} else