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

[kirben at users.sourceforge.net]

Revision: 22850
Author:   kirben
Date:     2006-06-02 20:04:19 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22850&view=rev

Log Message:
-----------
Correct setting of VAR_CHARINC in several functions, the value should only be reversed when using keyboard shortcuts (Due to the scrollbar)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/script_v8.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-06-03 01:05:09 UTC (rev 22849)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-06-03 03:04:19 UTC (rev 22850)
@@ -617,7 +617,7 @@
 		}
 
 		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			_defaultTalkDelay = 9 - getTalkspeed();
+			_defaultTalkDelay = getTalkspeed();
 			VAR(VAR_CHARINC) = _defaultTalkDelay;
 		} else {
 			_scummVars[var] = value;

Modified: scummvm/trunk/engines/scumm/script_v8.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v8.cpp	2006-06-03 01:05:09 UTC (rev 22849)
+++ scummvm/trunk/engines/scumm/script_v8.cpp	2006-06-03 03:04:19 UTC (rev 22850)
@@ -420,7 +420,7 @@
 		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;

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-06-03 01:05:09 UTC (rev 22849)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-06-03 03:04:19 UTC (rev 22850)
@@ -1503,7 +1503,7 @@
 	if (VAR_VOICE_MODE != 0xFF)
 		VAR(VAR_VOICE_MODE) = _voiceMode;
 
-	_defaultTalkDelay = 9 - getTalkspeed();
+	_defaultTalkDelay = getTalkspeed();
 	if (VAR_CHARINC != 0xFF)
 		VAR(VAR_CHARINC) = _defaultTalkDelay;
 }


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