aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-05-06 10:07:17 +0000
committerTravis Howell2004-05-06 10:07:17 +0000
commite78421b66c7b608b767d9b4579466fed989b83c6 (patch)
treec711bd693f6a0287ceb1b1feddb17bab03b35c2f /scumm
parentee94e81392b7da14459e6d9a0f1e0c31bff948c2 (diff)
downloadscummvm-rg350-e78421b66c7b608b767d9b4579466fed989b83c6.tar.gz
scummvm-rg350-e78421b66c7b608b767d9b4579466fed989b83c6.tar.bz2
scummvm-rg350-e78421b66c7b608b767d9b4579466fed989b83c6.zip
Fix bug #910216
svn-id: r13798
Diffstat (limited to 'scumm')
-rw-r--r--scumm/string.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 359ce08ea4..5eafe8e679 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -282,7 +282,7 @@ void ScummEngine::CHARSET_1() {
if (_version <= 3) {
_charset->printChar(c);
} else {
- if (!ConfMan.getBool("subtitles") && (_imuseDigital && _sound->isSoundRunning(kTalkSoundID))) {
+ if ((!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0) && (_imuseDigital && _sound->isSoundRunning(kTalkSoundID))) {
// Special case for games using imuse digital.for sound
} else if ((_gameId == GID_LOOM256) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
// Special case for loomcd, since it only uses CD audio.for sound