[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.581,2.582 string.cpp,1.196,1.197

[Travis Howell]

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

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

Ooops


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.581
retrieving revision 2.582
diff -u -d -r2.581 -r2.582
--- scummvm.cpp	21 Feb 2004 06:36:40 -0000	2.581
+++ scummvm.cpp	21 Feb 2004 06:44:10 -0000	2.582
@@ -1084,6 +1084,7 @@
 	_varwatch = -1;
 	_screenStartStrip = 0;
 
+	_defaultTalkDelay = 3;
 	_talkDelay = 0;
 	_keepText = false;
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- string.cpp	21 Feb 2004 06:36:40 -0000	1.196
+++ string.cpp	21 Feb 2004 06:44:10 -0000	1.197
@@ -318,7 +318,7 @@
 			_charset->_nextLeft = _charset->_left;
 			_charset->_nextTop = _charset->_top;
 			if (_version <= 2) {
-				_talkDelay += _defaultTalkDelay / 20;
+				_talkDelay += _defaultTalkDelay;
 				VAR(VAR_CHARCOUNT)++;
 			} else
 				_talkDelay += (int)VAR(VAR_CHARINC);