From 793bc427de9361db7a9eb840be8631da2fe69cf7 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 25 Feb 2004 10:48:35 +0000
Subject: Fix VAR_VOICE_MODE in COMI

svn-id: r13051
---
 scumm/script_v8.cpp | 4 +++-
 scumm/scummvm.cpp   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 40db14ace4..6096b64cc3 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1483,7 +1483,9 @@ void ScummEngine_v8::o8_kernelGetFunctions() {
 		// scripts. Probably a wrong push/pop somewhere. For now override to correct value.
 		array = 658;
 		ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
-		if (!strcmp((char *)ah->data, "Saveload Page") || !strcmp((char *)ah->data, "Object Names"))
+		if (!strcmp((char *)ah->data, "Text Status"))
+			push(ConfMan.getBool("subtitles"));
+		else if (!strcmp((char *)ah->data, "Saveload Page") || !strcmp((char *)ah->data, "Object Names"))
 			push(1);
 		else
 			push(0);
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index a66c7a8c1d..0e839611ce 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1204,7 +1204,7 @@ void ScummEngine::initScummVars() {
 	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
 		_scummVars[74] = 1225;
 
-	if (_version >= 7)
+	if (_version == 7)
 		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
 
 	VAR(VAR_CHARINC) = 4;
-- 
cgit v1.2.3