[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.103.2.2,1.103.2.3 saveload.cpp,1.140.2.4,1.140.2.5 scummvm.cpp,2.577.2.15,2.577.2.16

Travis Howell kirben at users.sourceforge.net
Sun Jun 20 06:24:02 CEST 2004


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

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

Missed one change in subtitle speed back ports.
Disable VAR_VOICE_MODE, needs more bug fixes back ported.


Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.103.2.2
retrieving revision 1.103.2.3
diff -u -d -r1.103.2.2 -r1.103.2.3
--- dialogs.cpp	3 May 2004 10:57:42 -0000	1.103.2.2
+++ dialogs.cpp	20 Jun 2004 13:23:41 -0000	1.103.2.3
@@ -464,9 +464,11 @@
 	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.4
retrieving revision 1.140.2.5
diff -u -d -r1.140.2.4 -r1.140.2.5
--- saveload.cpp	3 May 2004 11:02:13 -0000	1.140.2.4
+++ saveload.cpp	20 Jun 2004 13:23:41 -0000	1.140.2.5
@@ -209,9 +209,11 @@
 		_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: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.15
retrieving revision 2.577.2.16
diff -u -d -r2.577.2.15 -r2.577.2.16
--- scummvm.cpp	3 May 2004 11:15:38 -0000	2.577.2.15
+++ scummvm.cpp	20 Jun 2004 13:23:41 -0000	2.577.2.16
@@ -1102,6 +1102,7 @@
 	_varwatch = -1;
 	_screenStartStrip = 0;
 
+	_defaultTalkDelay = 3;
 	_talkDelay = 0;
 	_keepText = false;
 
@@ -1220,8 +1221,10 @@
 	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);





More information about the Scummvm-git-logs mailing list