aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-01-04 14:32:26 +0000
committerTravis Howell2004-01-04 14:32:26 +0000
commit694f02155cba6b7f8ed5cd5d4170eba935e9dcc6 (patch)
tree326b65843c2c28f62f530ff864b1d501f5a2e885
parentdacbe84029cd69303c500b8ac502b8e6ffa4af9c (diff)
downloadscummvm-rg350-694f02155cba6b7f8ed5cd5d4170eba935e9dcc6.tar.gz
scummvm-rg350-694f02155cba6b7f8ed5cd5d4170eba935e9dcc6.tar.bz2
scummvm-rg350-694f02155cba6b7f8ed5cd5d4170eba935e9dcc6.zip
Allow subtitles to be disabled in games using imuse digital again.
svn-id: r12137
-rw-r--r--scumm/string.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index d14a4474c9..80016dc286 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -319,7 +319,9 @@ void ScummEngine::CHARSET_1() {
if (_version <= 3) {
_charset->printChar(c);
} else {
- if ((_gameId == GID_LOOM256) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
+ if (!ConfMan.getBool("subtitles") && (_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
} else if (!ConfMan.getBool("subtitles") && (_haveMsg == 0xFE || _sound->_talkChannelHandle.isActive())) {
// Subtitles are turned off, and there is a voice version