From efbd2fe42feacbcc93a72932aadb35af8d8bd512 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 15 Jul 2004 23:15:13 +0000
Subject: Use VAR_DEFAULT_TALK_DELAY

svn-id: r14220
---
 scumm/scumm.cpp  | 4 +++-
 scumm/string.cpp | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'scumm')

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();
 	}
-- 
cgit v1.2.3