From 694f02155cba6b7f8ed5cd5d4170eba935e9dcc6 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 4 Jan 2004 14:32:26 +0000
Subject: Allow subtitles to be disabled in games using imuse digital again.

svn-id: r12137
---
 scumm/string.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scumm/string.cpp')

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
-- 
cgit v1.2.3