[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.148,1.149

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26866/scumm

Modified Files:
	script.cpp 
Log Message:

Ignore initial setting of VAR_NOSUBTITLES


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- script.cpp	19 Jan 2004 20:27:31 -0000	1.148
+++ script.cpp	11 Feb 2004 05:38:15 -0000	1.149
@@ -551,7 +551,10 @@
 		// stay in sync with loom cd subtitle var
 		if ((_gameId == GID_LOOM256 || _features & GF_HUMONGOUS) && var == VAR_NOSUBTITLES) {
 			assert(value == 0 || value == 1);
-			ConfMan.set("subtitles", (value == 0));
+			if ((_features & GF_HUMONGOUS) && vm.slot[_currentScript].number == 1)
+				value = !ConfMan.getBool("subtitles");
+			else
+				ConfMan.set("subtitles", (value == 0));
 		}
 
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {