aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2006-01-24 03:46:22 +0000
committerTravis Howell2006-01-24 03:46:22 +0000
commite70af9a9a9a29fa61a025afd0d0a8b84afd1321a (patch)
treeeccc01e958ffc3128c5f87c92da46f68b2762361 /scumm
parentd3373e49008476727309a479f8fe5ba86a2ac2d8 (diff)
downloadscummvm-rg350-e70af9a9a9a29fa61a025afd0d0a8b84afd1321a.tar.gz
scummvm-rg350-e70af9a9a9a29fa61a025afd0d0a8b84afd1321a.tar.bz2
scummvm-rg350-e70af9a9a9a29fa61a025afd0d0a8b84afd1321a.zip
Loom (Cd) specific.
svn-id: r20156
Diffstat (limited to 'scumm')
-rw-r--r--scumm/string.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index ee7cabf52f..e9223db4ab 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -578,8 +578,8 @@ void ScummEngine::CHARSET_1() {
// HE games which use sprites for subtitles
} else if (_heversion >= 60 && !ConfMan.getBool("subtitles") && _sound->isSoundRunning(1)) {
// Special case for HE games
- } else if ((_gameId == GID_LOOM) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
- // Special case for loomcd, since it only uses CD audio.for sound
+ } else if (_gameId == GID_LOOM && _version == 4 && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
+ // Special case for Loom (CD), since it only uses CD audio.for sound
} else if (!ConfMan.getBool("subtitles") && (!_haveActorSpeechMsg || _mixer->isSoundHandleActive(_sound->_talkChannelHandle))) {
// Subtitles are turned off, and there is a voice version
// of this message -> don't print it.