aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-02-21 06:44:10 +0000
committerTravis Howell2004-02-21 06:44:10 +0000
commita4a4c21956f5f2fd08194d0e824bbf2c62d072f3 (patch)
tree2e12d9726f13196e8cc29684b95c3745b326902c /scumm
parentcb939708dd0afc5c084ba551caf4fc648a930749 (diff)
downloadscummvm-rg350-a4a4c21956f5f2fd08194d0e824bbf2c62d072f3.tar.gz
scummvm-rg350-a4a4c21956f5f2fd08194d0e824bbf2c62d072f3.tar.bz2
scummvm-rg350-a4a4c21956f5f2fd08194d0e824bbf2c62d072f3.zip
Ooops
svn-id: r12954
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scummvm.cpp1
-rw-r--r--scumm/string.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index ac7afe8b48..b9a3875750 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1084,6 +1084,7 @@ void ScummEngine::scummInit() {
_varwatch = -1;
_screenStartStrip = 0;
+ _defaultTalkDelay = 3;
_talkDelay = 0;
_keepText = false;
diff --git a/scumm/string.cpp b/scumm/string.cpp
index ed76b2e5bb..eb5c095695 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -318,7 +318,7 @@ void ScummEngine::CHARSET_1() {
_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);