aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v8.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-02-21 02:03:53 +0000
committerTravis Howell2004-02-21 02:03:53 +0000
commitdfe5828d4fc98a880a7f6de61585c21208b945aa (patch)
treef0ed057f41c87c500d8a03e913b89f1da4db77da /scumm/script_v8.cpp
parente0b723a54c22806c45170ecca3f3456da14ce690 (diff)
downloadscummvm-rg350-dfe5828d4fc98a880a7f6de61585c21208b945aa.tar.gz
scummvm-rg350-dfe5828d4fc98a880a7f6de61585c21208b945aa.tar.bz2
scummvm-rg350-dfe5828d4fc98a880a7f6de61585c21208b945aa.zip
Use correct method for subtitle speed.
svn-id: r12949
Diffstat (limited to 'scumm/script_v8.cpp')
-rw-r--r--scumm/script_v8.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 37541b4371..725f8b90c7 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -422,8 +422,10 @@ void ScummEngine_v8::writeVar(uint var, int value) {
if (!(var & 0xF0000000)) {
checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
- if (var == VAR_CHARINC) {
- VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
+ if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
+ int talkspeed = ConfMan.getInt("talkspeed") / 20;
+ if (talkspeed >= 0 && talkspeed <= 180)
+ VAR(VAR_CHARINC) = talkspeed;
} else
_scummVars[var] = value;