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

[eriktorbjorn at users.sourceforge.net]

Revision: 22748
Author:   eriktorbjorn
Date:     2006-05-29 10:27:22 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22748&view=rev

Log Message:
-----------
If we're going to intercept attempts to set VAR(VAR_CHARINC) in writeVar(), we
should probably set it the same way as updateSoundSettings() does it, i.e. to
9 - getTalkspeed(), not getTalkspeed().

I was testing the scene in Sam & Max where you give candy to Doug. I had set
the talk speed to max. The script tried to set CHARINC to 3, but instead it was
changed from 0 to 9...

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/script_v8.cpp
Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-05-29 15:24:15 UTC (rev 22747)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-05-29 17:27:22 UTC (rev 22748)
@@ -617,9 +617,8 @@
 		}
 
 		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			uint talkspeed = getTalkspeed();
-			if (talkspeed <= 9)
-				VAR(VAR_CHARINC) = talkspeed;
+			_defaultTalkDelay = 9 - 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-05-29 15:24:15 UTC (rev 22747)
+++ scummvm/trunk/engines/scumm/script_v8.cpp	2006-05-29 17:27:22 UTC (rev 22748)
@@ -420,9 +420,8 @@
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
 
 		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			uint talkspeed = getTalkspeed();
-			if (talkspeed <= 9)
-				VAR(VAR_CHARINC) = talkspeed;
+			_defaultTalkDelay = 9 - getTalkspeed();
+			VAR(VAR_CHARINC) = _defaultTalkDelay;
 		} else
 			_scummVars[var] = value;
 


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