[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.219,1.220 vars.cpp,1.133,1.134

[kirben]

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

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

HE60/61 still VAR_NOSUBTITLES.
Typo.


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- script.cpp	9 May 2005 02:38:57 -0000	1.219
+++ script.cpp	9 May 2005 02:59:45 -0000	1.220
@@ -508,7 +508,7 @@
 		if (VAR_SUBTITLES != 0xFF && var == VAR_SUBTITLES) {
 			return ConfMan.getBool("subtitles");
 		} 
-		if (VAR_SUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
+		if (VAR_NOSUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
 			return !ConfMan.getBool("subtitles");	
 		}
 		
@@ -574,13 +574,13 @@
 		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 <= 61 && vm.slot[_currentScript].number == 1)
-				return;
 			assert(value == 0 || value == 1);
 			ConfMan.set("subtitles", value);
 		}
 		if (VAR_NOSUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
+			// Ignore default setting in HE60/61 games
+			if ((_heversion >= 60 && _heversion <= 61) && vm.slot[_currentScript].number == 1)
+				return;
 			assert(value == 0 || value == 1);
 			ConfMan.set("subtitles", !value);
 		}

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- vars.cpp	9 May 2005 02:38:58 -0000	1.133
+++ vars.cpp	9 May 2005 02:59:45 -0000	1.134
@@ -167,7 +167,11 @@
 	VAR_ROOM_WIDTH = 41;
 	VAR_ROOM_HEIGHT = 54;
 
-	VAR_SUBTITLES = 60;
+	if (_heversion >= 60 && _heversion <= 61) {	
+		VAR_NOSUBTITLES = 60;
+	} else {
+		VAR_SUBTITLES = 60;
+	}
 
 	VAR_LEFTBTN_HOLD = 74;
 	VAR_RIGHTBTN_HOLD = 75;