[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.126,1.127

[Travis Howell]

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

Modified Files:
	script.cpp 
Log Message:

Override default initial setting of subtitles enabled in loomcd


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- script.cpp	24 Aug 2003 01:47:44 -0000	1.126
+++ script.cpp	1 Sep 2003 01:50:07 -0000	1.127
@@ -544,8 +544,14 @@
 			_scummVars[var] = value;
 
 		// stay in sync with loom cd subtitle var
-		if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES && (value == 0 || value == 1))
-			_noSubtitles = (value != 0);
+		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 ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)