diff options
| author | Max Horn | 2008-09-17 18:56:13 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-17 18:56:13 +0000 |
| commit | d4853dd9e84b43cfcc410829625c19c4b9d0b6c6 (patch) | |
| tree | 82df78edbfb239eca1182feea3b0a578b8d944f0 /engines/scumm/scumm.cpp | |
| parent | 468b387b9714f4a9ceea05b6ec505a66d67e1998 (diff) | |
| download | scummvm-rg350-d4853dd9e84b43cfcc410829625c19c4b9d0b6c6.tar.gz scummvm-rg350-d4853dd9e84b43cfcc410829625c19c4b9d0b6c6.tar.bz2 scummvm-rg350-d4853dd9e84b43cfcc410829625c19c4b9d0b6c6.zip | |
Patch #2060517: SCUMM: engine sets incorrect talkspeed value
svn-id: r34596
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 00591f3d17..f87adfd9ac 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1693,17 +1693,17 @@ void ScummEngine::syncSoundSettings() { if (VAR_VOICE_MODE != 0xFF) VAR(VAR_VOICE_MODE) = _voiceMode; - _defaultTalkDelay = getTalkspeed(); + _defaultTalkDelay = getTalkDelay(); if (VAR_CHARINC != 0xFF) VAR(VAR_CHARINC) = _defaultTalkDelay; } -void ScummEngine::setTalkspeed(int talkspeed) { - ConfMan.setInt("talkspeed", (talkspeed * 255 + 9 / 2) / 9); +void ScummEngine::setTalkDelay(int talkdelay) { + ConfMan.setInt("talkspeed", ((9 - talkdelay) * 255 + 9 / 2) / 9); } -int ScummEngine::getTalkspeed() { - return (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255; +int ScummEngine::getTalkDelay() { + return 9 - (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255; } |