[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.235,2.236 scummvm.cpp,2.588,2.589

[Travis Howell]

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

Modified Files:
	script_v8.cpp scummvm.cpp 
Log Message:

Fix VAR_VOICE_MODE in COMI


Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.235
retrieving revision 2.236
diff -u -d -r2.235 -r2.236
--- script_v8.cpp	24 Feb 2004 14:29:56 -0000	2.235
+++ script_v8.cpp	25 Feb 2004 10:48:35 -0000	2.236
@@ -1483,7 +1483,9 @@
 		// 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);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.588
retrieving revision 2.589
diff -u -d -r2.588 -r2.589
--- scummvm.cpp	24 Feb 2004 22:39:39 -0000	2.588
+++ scummvm.cpp	25 Feb 2004 10:48:35 -0000	2.589
@@ -1204,7 +1204,7 @@
 	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;