aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-07-15 23:15:13 +0000
committerTravis Howell2004-07-15 23:15:13 +0000
commitefbd2fe42feacbcc93a72932aadb35af8d8bd512 (patch)
tree4c777a0e29635b01e253658003bfd4ebb67ff0b6
parent85124a75e388c4f6edac12ca07e8a3f1e615a447 (diff)
downloadscummvm-rg350-efbd2fe42feacbcc93a72932aadb35af8d8bd512.tar.gz
scummvm-rg350-efbd2fe42feacbcc93a72932aadb35af8d8bd512.tar.bz2
scummvm-rg350-efbd2fe42feacbcc93a72932aadb35af8d8bd512.zip
Use VAR_DEFAULT_TALK_DELAY
svn-id: r14220
-rw-r--r--scumm/scumm.cpp4
-rw-r--r--scumm/string.cpp7
2 files changed, 8 insertions, 3 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index e183eb162c..45259a24c8 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1363,8 +1363,10 @@ void ScummEngine::initScummVars() {
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);
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 70b3cb0aa6..a580c481a8 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -155,8 +155,11 @@ void ScummEngine::CHARSET_1() {
}
// Always set to 60
- _talkDelay = 60;
-
+ if (_version <= 6)
+ _talkDelay = 60;
+ else
+ _talkDelay = VAR(VAR_DEFAULT_TALK_DELAY);
+
if (!_keepText) {
_charset->restoreCharsetBg();
}