aboutsummaryrefslogtreecommitdiff
path: root/scumm/script.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r--scumm/script.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 0c18a87831..ed8c79bc9f 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -543,9 +543,11 @@ void ScummEngine::writeVar(uint var, int value) {
checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
// FIXME: Find some better place to put this.
- if (var == VAR_CHARINC)
- VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
- else
+ 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;
// stay in sync with loom cd subtitle var