[Scummvm-cvs-logs] SF.net SVN: scummvm: [22462] scummvm/trunk/engines/scumm/scumm.cpp

[kirben at users.sourceforge.net]

Revision: 22462
Author:   kirben
Date:     2006-05-13 23:00:40 -0700 (Sat, 13 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22462&view=rev

Log Message:
-----------
Check if VAR_CHARINC exists, before setting value in updateSoundSettings()

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-05-13 18:14:23 UTC (rev 22461)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-05-14 06:00:40 UTC (rev 22462)
@@ -1513,7 +1513,8 @@
 		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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.