From 9673833d97135fd9b5af5f3457f11babcba59d72 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 16 Dec 2003 08:03:14 +0000
Subject: Fix for bug #856624, "FT: '.' key wipes out conversation responses".

svn-id: r11678
---
 scumm/scummvm.cpp | 12 +++++++++---
 1 file 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");
-- 
cgit v1.2.3