HE60/61 still VAR_NOSUBTITLES.

Typo.

svn-id: r17990

2 files changed, 9 insertions, 5 deletions

diff --git a/scumm/script.cpp b/scumm/script.cpp
index 03ad159690..dcaef1b1d1 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -508,7 +508,7 @@ int ScummEngine::readVar(uint var) {
 		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 @@ void ScummEngine::writeVar(uint var, int value) {
 		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);
 		}
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 8911a92e39..1dd1f43292 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -167,7 +167,11 @@ void ScummEngine_v6::setupScummVars() {
 	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;