aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-02-20 17:12:16 +0000
committerTravis Howell2004-02-20 17:12:16 +0000
commit5c59d9a66b5cf9ac9d11da915cef9684bbae2058 (patch)
tree5c82b9cb2443a784d44d07e788abccc1032b14d2 /scumm
parent83a76bb131ced26a86e3c1e61812a63ab1d100b7 (diff)
downloadscummvm-rg350-5c59d9a66b5cf9ac9d11da915cef9684bbae2058.tar.gz
scummvm-rg350-5c59d9a66b5cf9ac9d11da915cef9684bbae2058.tar.bz2
scummvm-rg350-5c59d9a66b5cf9ac9d11da915cef9684bbae2058.zip
Correct another bad comi var
svn-id: r12944
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v8.cpp5
-rw-r--r--scumm/vars.cpp3
2 files changed, 6 insertions, 2 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 1ce60730e2..37541b4371 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -422,7 +422,10 @@ void ScummEngine_v8::writeVar(uint var, int value) {
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)
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index d8afe32c8d..554ae3b36d 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -340,7 +340,8 @@ void ScummEngine_v8::setupScummVars() {
VAR_KEYPRESS = 132;
VAR_SYNC = 134;
- VAR_CHARINC = 221;
+ VAR_DEFAULT_TALK_DELAY = 128;
+ VAR_CHARINC = 129;
}
} // End of namespace Scumm