diff options
| author | Torbjörn Andersson | 2003-12-16 08:03:14 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-12-16 08:03:14 +0000 |
| commit | 9673833d97135fd9b5af5f3457f11babcba59d72 (patch) | |
| tree | b1fe95f4a882cecf7847393baad9cf4ddaa6ddc3 /scumm | |
| parent | 362a37266dabd63d95e347e00191add976d7193c (diff) | |
| download | scummvm-rg350-9673833d97135fd9b5af5f3457f11babcba59d72.tar.gz scummvm-rg350-9673833d97135fd9b5af5f3457f11babcba59d72.tar.bz2 scummvm-rg350-9673833d97135fd9b5af5f3457f11babcba59d72.zip | |
Fix for bug #856624, "FT: '.' key wipes out conversation responses".
svn-id: r11678
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 7e2666e5cb..2f2614e6a6 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1894,9 +1894,15 @@ void ScummEngine::processKbd() { runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0); return; } else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) { - _talkDelay = 0; - if (_sound->_sfxMode & 2) - stopTalk(); + // Some text never times out, and should never be skipped. The + // Full Throttle conversation menus is the main - perhaps the + // only - example of this. + + if (_talkDelay != -1) { + _talkDelay = 0; + if (_sound->_sfxMode & 2) + stopTalk(); + } return; } else if (_lastKeyHit == '[') { // [ Music volume down int vol = ConfMan.getInt("music_volume"); |