diff options
| author | Max Horn | 2008-11-15 13:54:16 +0000 |
|---|---|---|
| committer | Max Horn | 2008-11-15 13:54:16 +0000 |
| commit | 3a3698f960608e8777620c9e454d6ed2282a036d (patch) | |
| tree | a2699b6f442835142e831c56535fe1d56376eaed /engines/scumm/script.cpp | |
| parent | 2f7197ead1b7cffb0ccfdd5b10047692a874ae1c (diff) | |
| download | scummvm-rg350-3a3698f960608e8777620c9e454d6ed2282a036d.tar.gz scummvm-rg350-3a3698f960608e8777620c9e454d6ed2282a036d.tar.bz2 scummvm-rg350-3a3698f960608e8777620c9e454d6ed2282a036d.zip | |
Fix for bug #2251765: FT: Talk speed inconsistency
svn-id: r35082
Diffstat (limited to 'engines/scumm/script.cpp')
| -rw-r--r-- | engines/scumm/script.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index 642627d649..1dbc87dd79 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -624,7 +624,12 @@ void ScummEngine::writeVar(uint var, int value) { } if (var == VAR_CHARINC) { - if (ConfMan.hasKey("talkspeed")) { + // Did the user override the talkspeed manually? Then use that. + // Otherwise, use the value specified by the game script. + // Note: To determine whether there was a user override, we only + // look at the target specific settings, assuming that any global + // value is likely to be bogus. See also bug #2251765. + if (ConfMan.hasKey("talkspeed", _targetName)) { value = getTalkDelay(); } else { // Save the new talkspeed value to ConfMan |