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

[fingolfin at users.sourceforge.net]

Revision: 35082
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35082&view=rev
Author:   fingolfin
Date:     2008-11-15 13:54:16 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
Fix for bug #2251765: FT: Talk speed inconsistency

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2008-11-15 13:19:40 UTC (rev 35081)
+++ scummvm/trunk/engines/scumm/script.cpp	2008-11-15 13:54:16 UTC (rev 35082)
@@ -624,7 +624,12 @@
 		}
 
 		if (var == VAR_CHARINC) {
-			if (ConfMan.hasKey("talkspeed")) {
+			// Did the user override the talkspeed manually? Then use that.
+			// Otherwise, use the value specified by the game script.
+			// Note: To determine whether there was a user override, we only
+			// look at the target specific settings, assuming that any global
+			// value is likely to be bogus. See also bug #2251765.
+			if (ConfMan.hasKey("talkspeed", _targetName)) {
 				value = getTalkDelay();
 			} else {
 				// Save the new talkspeed value to ConfMan


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