diff options
| -rw-r--r-- | scumm/scummvm.cpp | 13 | ||||
| -rw-r--r-- | scumm/string.cpp | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index ea763c3404..ac7afe8b48 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1199,7 +1199,6 @@ void ScummEngine::initScummVars() { VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen; } - _defaultTalkDelay = 60; VAR(VAR_CHARINC) = 4; talkingActor(0); } @@ -1884,11 +1883,15 @@ void ScummEngine::processKbd(bool smushMode) { if (_imuse) _imuse->set_music_volume (vol); } else if (_lastKeyHit == '-') { // - text speed down - if (VAR(VAR_CHARINC) < 9) - VAR(VAR_CHARINC) = + 1; + if (_defaultTalkDelay < 9) + _defaultTalkDelay++; + if (VAR_CHARINC != 0xFF) + VAR(VAR_CHARINC) = _defaultTalkDelay; } else if (_lastKeyHit == '+') { // + text speed up - if (VAR(VAR_CHARINC) > 0) - VAR(VAR_CHARINC) -= 1; + if (_defaultTalkDelay > 0) + _defaultTalkDelay--; + if (VAR_CHARINC != 0xFF) + VAR(VAR_CHARINC) = _defaultTalkDelay; } else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console _debugger->attach(); } else if (_version <= 2) { diff --git a/scumm/string.cpp b/scumm/string.cpp index e36f612ae8..ed76b2e5bb 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -177,7 +177,8 @@ void ScummEngine::CHARSET_1() { _useTalkAnims = true; } - _talkDelay = _defaultTalkDelay; + // Always set to 60 + _talkDelay = 60; if (!_keepText) { if (_version <= 3 && _gameId != GID_LOOM) { |