[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.234,1.235

[kirben]

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

Modified Files:
	script.cpp 
Log Message:

Allow subtitles to be disabled in HE70 - HE73 games.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- script.cpp	5 Nov 2005 09:23:05 -0000	1.234
+++ script.cpp	15 Nov 2005 22:42:33 -0000	1.235
@@ -583,6 +583,9 @@
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
 
 		if (VAR_SUBTITLES != 0xFF && var == VAR_SUBTITLES) {
+			// Ignore default setting in HE60/61 games
+			if ((_heversion >= 70 && _heversion <= 73) && vm.slot[_currentScript].number == 1)
+				return;
 			assert(value == 0 || value == 1);
 			ConfMan.set("subtitles", value);
 		}