From fc26d9b413b6575ccb7be2f77ae2a12f80de0a1e Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 3 Jun 2006 04:10:14 +0000
Subject: Update talkspeed config setting, when set by game scripts

svn-id: r22854
---
 engines/scumm/script.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/scumm/script.cpp')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 79f083e05e..ab365e7c87 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -618,15 +618,15 @@ void ScummEngine::writeVar(uint var, int value) {
 
 		if (var == VAR_CHARINC) {
 			if (ConfMan.hasKey("talkspeed")) {
-				VAR(VAR_CHARINC) = getTalkspeed();
+				value = getTalkspeed();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkspeed(_defaultTalkDelay);
+				setTalkspeed(value);
 			}
-		} else {
-			_scummVars[var] = value;
 		}
 
+		_scummVars[var] = value;
+
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)
 				debug(1, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number);
-- 
cgit v1.2.3