From ea8d2a0fd010e65cecd60effc04f4c8a838859be Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 20 Apr 2005 01:42:55 +0000
Subject: Correction to last commits.

svn-id: r17700
---
 scumm/script.cpp | 4 ++--
 scumm/scumm.h    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script.cpp b/scumm/script.cpp
index 76e4ce6ff9..ff97f325ca 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -360,7 +360,7 @@ void ScummEngine::updateScriptPtr() {
 void ScummEngine::nukeArrays(byte scriptSlot) {
 	int i;
 
-	if (_heversion < 60 || scriptSlot == 0)
+	if (_heversion == 0 || scriptSlot == 0)
 		return;
 
 	for (i = 1; i < _numArray; i++) {
@@ -584,7 +584,7 @@ void ScummEngine::writeVar(uint var, int value) {
 		// stay in sync with loom cd subtitle var
 		if ((_gameId == GID_LOOM256 || _heversion >= 60) && var == VAR_NOSUBTITLES) {
 			assert(value == 0 || value == 1);
-			if (_heversion == 60 && vm.slot[_currentScript].number == 1)
+			if (_heversion <= 61 && vm.slot[_currentScript].number == 1)
 				value = !ConfMan.getBool("subtitles");
 			else
 				ConfMan.set("subtitles", (value == 0));
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 153eea2fe9..800f82ab52 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -115,7 +115,6 @@ enum GameFeatures {
 	GF_FEW_LOCALS          = 1 << 13,
 
 	/** Games made by Humongous Entertainment. */
-	GF_HUMONGOUS           = 1 << 14,
 	GF_MULTIPLE_VERSIONS   = 1 << 15,
 	
 	GF_FMTOWNS             = 1 << 17,
-- 
cgit v1.2.3