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

[kirben at users.sourceforge.net]

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

Log Message:
-----------
Update talkspeed config setting, when set by game scripts

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/input.cpp
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/script_v8.cpp
Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2006-06-03 03:38:24 UTC (rev 22852)
+++ scummvm/trunk/engines/scumm/input.cpp	2006-06-03 03:51:17 UTC (rev 22853)
@@ -447,7 +447,7 @@
 		_defaultTalkDelay = 9 - runDialog(dlg);
 		
 		// Save the new talkspeed value to ConfMan
-		setTalkspeed(9 - _defaultTalkDelay);
+		setTalkspeed(_defaultTalkDelay);
 
 		if (VAR_CHARINC != 0xFF)
 			VAR(VAR_CHARINC) = _defaultTalkDelay;

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-06-03 03:38:24 UTC (rev 22852)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-06-03 03:51:17 UTC (rev 22853)
@@ -616,9 +616,13 @@
 			ConfMan.setBool("subtitles", !value);
 		}
 
-		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			_defaultTalkDelay = getTalkspeed();
-			VAR(VAR_CHARINC) = _defaultTalkDelay;
+		if (var == VAR_CHARINC) {
+			if (ConfMan.hasKey("talkspeed")) {
+				VAR(VAR_CHARINC) = getTalkspeed();
+			} else {
+				// Save the new talkspeed value to ConfMan
+				setTalkspeed(_defaultTalkDelay);
+			}
 		} else {
 			_scummVars[var] = value;
 		}

Modified: scummvm/trunk/engines/scumm/script_v8.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v8.cpp	2006-06-03 03:38:24 UTC (rev 22852)
+++ scummvm/trunk/engines/scumm/script_v8.cpp	2006-06-03 03:51:17 UTC (rev 22853)
@@ -419,11 +419,17 @@
 	if (!(var & 0xF0000000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
 
-		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			_defaultTalkDelay = getTalkspeed();
-			VAR(VAR_CHARINC) = _defaultTalkDelay;
-		} else
+		if (var == VAR_CHARINC) {
+			if (ConfMan.hasKey("talkspeed")) {
+				_defaultTalkDelay = getTalkspeed();
+				VAR(VAR_CHARINC) = _defaultTalkDelay;
+			} else {
+				// Save the new talkspeed value to ConfMan
+				setTalkspeed(_defaultTalkDelay);
+			}
+		} else {
 			_scummVars[var] = value;
+		}
 
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)


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