[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.510,2.511

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4410

Modified Files:
	scummvm.cpp 
Log Message:
Fix for bug #856624, "FT: '.' key wipes out conversation responses".


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.510
retrieving revision 2.511
diff -u -d -r2.510 -r2.511
--- scummvm.cpp	15 Dec 2003 20:33:40 -0000	2.510
+++ scummvm.cpp	16 Dec 2003 08:03:14 -0000	2.511
@@ -1894,9 +1894,15 @@
 			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");