aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2009-01-11 06:51:17 +0000
committerTravis Howell2009-01-11 06:51:17 +0000
commit954a1d27d8705fa31a0cbf2f6a6597f4522b9071 (patch)
treeb0b542cdeb5ce1631688839d9450a5de3d81508b /engines/scumm/scumm.cpp
parent4e15c8df3517661ae9ed092409d2057f424c79d6 (diff)
downloadscummvm-rg350-954a1d27d8705fa31a0cbf2f6a6597f4522b9071.tar.gz
scummvm-rg350-954a1d27d8705fa31a0cbf2f6a6597f4522b9071.tar.bz2
scummvm-rg350-954a1d27d8705fa31a0cbf2f6a6597f4522b9071.zip
Fix talkspeed settings again.
svn-id: r35821
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index f238ec4b37..78329dd3e4 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1706,9 +1706,11 @@ void ScummEngine::syncSoundSettings() {
if (VAR_VOICE_MODE != 0xFF)
VAR(VAR_VOICE_MODE) = _voiceMode;
- _defaultTalkDelay = getTalkDelay();
- if (VAR_CHARINC != 0xFF)
- VAR(VAR_CHARINC) = _defaultTalkDelay;
+ if (ConfMan.hasKey("talkspeed", _targetName)) {
+ _defaultTalkDelay = getTalkDelay();
+ if (VAR_CHARINC != 0xFF)
+ VAR(VAR_CHARINC) = _defaultTalkDelay;
+ }
}
void ScummEngine::setTalkDelay(int talkdelay) {