From 61e9bc72e43176c58479124e2a2d82c8989645ef Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 3 Jun 2006 03:04:19 +0000
Subject: Correct setting of VAR_CHARINC in several functions, the value should
 only be reversed when using keyboard shortcuts (Due to the scrollbar)

svn-id: r22850
---
 engines/scumm/script.cpp    | 2 +-
 engines/scumm/script_v8.cpp | 2 +-
 engines/scumm/scumm.cpp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index b7a3422021..078f213a24 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -617,7 +617,7 @@ void ScummEngine::writeVar(uint var, int value) {
 		}
 
 		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			_defaultTalkDelay = 9 - getTalkspeed();
+			_defaultTalkDelay = getTalkspeed();
 			VAR(VAR_CHARINC) = _defaultTalkDelay;
 		} else {
 			_scummVars[var] = value;
diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index 55c1aa376c..14e59d42d6 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -420,7 +420,7 @@ void ScummEngine_v8::writeVar(uint var, int value) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
 
 		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			_defaultTalkDelay = 9 - getTalkspeed();
+			_defaultTalkDelay = getTalkspeed();
 			VAR(VAR_CHARINC) = _defaultTalkDelay;
 		} else
 			_scummVars[var] = value;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 8c3562c281..7fe28facd6 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1503,7 +1503,7 @@ void ScummEngine::updateSoundSettings() {
 	if (VAR_VOICE_MODE != 0xFF)
 		VAR(VAR_VOICE_MODE) = _voiceMode;
 
-	_defaultTalkDelay = 9 - getTalkspeed();
+	_defaultTalkDelay = getTalkspeed();
 	if (VAR_CHARINC != 0xFF)
 		VAR(VAR_CHARINC) = _defaultTalkDelay;
 }
-- 
cgit v1.2.3