[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.86,1.87 string.cpp,1.223,1.224

[Travis Howell]

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

Modified Files:
	scumm.cpp string.cpp 
Log Message:

Use VAR_DEFAULT_TALK_DELAY


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- scumm.cpp	14 Jul 2004 08:55:31 -0000	1.86
+++ scumm.cpp	15 Jul 2004 23:15:13 -0000	1.87
@@ -1363,8 +1363,10 @@
 	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
 		_scummVars[74] = 1225;
 
-	if (_version >= 7)
+	if (_version >= 7) {
+		VAR(VAR_DEFAULT_TALK_DELAY) = 60;
 		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
+	}
 
 	VAR(VAR_CHARINC) = 4;
 	setTalkingActor(0);

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- string.cpp	15 Jul 2004 12:26:10 -0000	1.223
+++ string.cpp	15 Jul 2004 23:15:13 -0000	1.224
@@ -155,8 +155,11 @@
 	}
 
 	// Always set to 60
-	_talkDelay = 60;
-
+	if (_version <= 6)
+		_talkDelay = 60;
+	else
+		_talkDelay = VAR(VAR_DEFAULT_TALK_DELAY);
+		
 	if (!_keepText) {
 		_charset->restoreCharsetBg();
 	}