From c5141005e0e1e3ed0ac082d7c357683762e0bb0c Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 1 Sep 2003 03:08:32 +0000
Subject: Add CD audio check for loomcd Revert last change, since it wipped out
 intro. text.

svn-id: r9947
---
 scumm/script.cpp | 10 ++--------
 scumm/string.cpp |  5 ++---
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script.cpp b/scumm/script.cpp
index f0533d1b4e..de1bc96afd 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -544,14 +544,8 @@ void Scumm::writeVar(uint var, int value) {
 			_scummVars[var] = value;
 
 		// stay in sync with loom cd subtitle var
-		if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES && (value == 0 || value == 1)) {
-			// Override default initial setting of subtitles enabled
-			if (vm.slot[_currentScript].number == 1)
-				value = _noSubtitles;
-			else 
-				_noSubtitles = (value != 0);
-		}
-
+		if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES && (value == 0 || value == 1)) 
+			_noSubtitles = (value != 0);
 
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)
diff --git a/scumm/string.cpp b/scumm/string.cpp
index dee0c92e54..446978dfe6 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -310,9 +310,8 @@ void Scumm::CHARSET_1() {
 			if (_version <= 3) {
 				_charset->printChar(c);
 			} else {
-				if ((_gameId == GID_LOOM256) && _noSubtitles) {
-					// FIXME Special case for loomcd, since it only uses CD audio.for sound
-					// We need a way to check if CD audio is been used
+				if ((_gameId == GID_LOOM256) && _noSubtitles && (_sound->pollCD())) {
+					// Special case for loomcd, since it only uses CD audio.for sound
 				} else if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) {
 					// Subtitles are turned off, and there is a voice version
 					// of this message -> don't print it. 
-- 
cgit v1.2.3