From ada0160e8845c8462b4bbd8460209c00d829823e Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 14 May 2006 06:00:40 +0000
Subject: Check if VAR_CHARINC exists, before setting value in
 updateSoundSettings()

svn-id: r22462
---
 engines/scumm/scumm.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 4037482f14..a1e0015975 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1513,7 +1513,8 @@ void ScummEngine::updateSoundSettings() {
 		VAR(VAR_VOICE_MODE) = _voiceMode;
 
 	_defaultTalkDelay = 9 - getTalkspeed();
-	VAR(VAR_CHARINC) = _defaultTalkDelay;
+	if (VAR_CHARINC != 0xFF)
+		VAR(VAR_CHARINC) = _defaultTalkDelay;
 }
 
 void ScummEngine::setTalkspeed(int talkspeed) {
-- 
cgit v1.2.3