[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.127,1.128 string.cpp,1.155,1.156

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17719/scumm

Modified Files:
	script.cpp string.cpp 
Log Message:

Add CD audio check for loomcd
Revert last change, since it wipped out intro. text.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- script.cpp	1 Sep 2003 01:50:07 -0000	1.127
+++ script.cpp	1 Sep 2003 03:08:32 -0000	1.128
@@ -544,14 +544,8 @@
 			_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)

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- string.cpp	28 Aug 2003 12:23:35 -0000	1.155
+++ string.cpp	1 Sep 2003 03:08:32 -0000	1.156
@@ -310,9 +310,8 @@
 			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.