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

[kirben at users.sourceforge.net]

Revision: 22854
Author:   kirben
Date:     2006-06-02 21:10:14 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22854&view=rev

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

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-06-03 03:51:17 UTC (rev 22853)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-06-03 04:10:14 UTC (rev 22854)
@@ -618,15 +618,15 @@
 
 		if (var == VAR_CHARINC) {
 			if (ConfMan.hasKey("talkspeed")) {
-				VAR(VAR_CHARINC) = getTalkspeed();
+				value = getTalkspeed();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkspeed(_defaultTalkDelay);
+				setTalkspeed(value);
 			}
-		} else {
-			_scummVars[var] = value;
 		}
 
+		_scummVars[var] = value;
+
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)
 				debug(1, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number);

Modified: scummvm/trunk/engines/scumm/script_v8.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v8.cpp	2006-06-03 03:51:17 UTC (rev 22853)
+++ scummvm/trunk/engines/scumm/script_v8.cpp	2006-06-03 04:10:14 UTC (rev 22854)
@@ -421,16 +421,15 @@
 
 		if (var == VAR_CHARINC) {
 			if (ConfMan.hasKey("talkspeed")) {
-				_defaultTalkDelay = getTalkspeed();
-				VAR(VAR_CHARINC) = _defaultTalkDelay;
+				value = getTalkspeed();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkspeed(_defaultTalkDelay);
+				setTalkspeed(value);
 			}
-		} else {
-			_scummVars[var] = value;
 		}
 
+		_scummVars[var] = value;
+
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)
 				debugC(DEBUG_VARS, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number);


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