[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.103.2.3,1.103.2.4 saveload.cpp,1.140.2.7,1.140.2.8 script_v8.cpp,2.229.2.6,2.229.2.7 scummvm.cpp,2.577.2.25,2.577.2.26

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	dialogs.cpp saveload.cpp script_v8.cpp scummvm.cpp 
Log Message:

VAR_VOICE_MODE works fine now


Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.103.2.3
retrieving revision 1.103.2.4
diff -u -d -r1.103.2.3 -r1.103.2.4
--- dialogs.cpp	20 Jun 2004 13:23:41 -0000	1.103.2.3
+++ dialogs.cpp	19 Jul 2004 00:01:36 -0000	1.103.2.4
@@ -464,11 +464,9 @@
 	if (getResult()) {
 		// Subtitles
 		ConfMan.set("subtitles", subtitlesCheckbox->getState(), _domain);
-		/*
 		// Sync with current setting
 		if (_vm->_version >= 7)
 			_vm->VAR(_vm->VAR_VOICE_MODE) = subtitlesCheckbox->getState();
-		*/
 	}
 
 	GUI_OptionsDialog::close();

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.140.2.7
retrieving revision 1.140.2.8
diff -u -d -r1.140.2.7 -r1.140.2.8
--- saveload.cpp	18 Jul 2004 05:09:33 -0000	1.140.2.7
+++ saveload.cpp	19 Jul 2004 00:01:37 -0000	1.140.2.8
@@ -210,11 +210,9 @@
 		_scummVars[VAR_CAMERA_ACCEL_Y] = _scummVars[110];
 	}
 
-/*
 	// Sync with current config setting
 	if (_version >= 7)
 		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
-*/
 
 	// We could simply dirty colours 0-15 for 16-colour games -- nowadays
 	// they handle their palette pretty much like the more recent games

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.229.2.6
retrieving revision 2.229.2.7
diff -u -d -r2.229.2.6 -r2.229.2.7
--- script_v8.cpp	18 Jul 2004 22:15:52 -0000	2.229.2.6
+++ script_v8.cpp	19 Jul 2004 00:01:37 -0000	2.229.2.7
@@ -1464,12 +1464,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, "Text Status"))
 			push(ConfMan.getBool("subtitles"));
-		else 
-*/
-		if (!strcmp((char *)ah->data, "Saveload Page") || !strcmp((char *)ah->data, "Object Names"))
+		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/Attic/scummvm.cpp,v
retrieving revision 2.577.2.25
retrieving revision 2.577.2.26
diff -u -d -r2.577.2.25 -r2.577.2.26
--- scummvm.cpp	18 Jul 2004 22:29:04 -0000	2.577.2.25
+++ scummvm.cpp	19 Jul 2004 00:01:37 -0000	2.577.2.26
@@ -1227,10 +1227,8 @@
 	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
 		_scummVars[74] = 1225;
 	
-/*
 	if (_version == 7)
 		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
-*/
 
 	VAR(VAR_CHARINC) = 4;
 	setTalkingActor(0);