[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.229,2.230 vars.cpp,1.73,1.74

Travis Howell kirben at users.sourceforge.net
Fri Feb 20 09:24:07 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26543/scumm

Modified Files:
	script_v8.cpp vars.cpp 
Log Message:

Correct another bad comi var


Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.229
retrieving revision 2.230
diff -u -d -r2.229 -r2.230
--- script_v8.cpp	13 Feb 2004 06:43:10 -0000	2.229
+++ script_v8.cpp	20 Feb 2004 17:12:08 -0000	2.230
@@ -422,7 +422,10 @@
 	if (!(var & 0xF0000000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
 
-		_scummVars[var] = value;
+		if (var == VAR_CHARINC) {
+			VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
+		} else
+			_scummVars[var] = value;
 
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- vars.cpp	20 Feb 2004 15:46:11 -0000	1.73
+++ vars.cpp	20 Feb 2004 17:12:16 -0000	1.74
@@ -340,7 +340,8 @@
 	VAR_KEYPRESS = 132;
 	VAR_SYNC = 134;
 
-	VAR_CHARINC = 221;
+	VAR_DEFAULT_TALK_DELAY = 128;
+	VAR_CHARINC = 129;
 }
 
 } // End of namespace Scumm





More information about the Scummvm-git-logs mailing list