[Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.21,2.22

Max Horn fingolfin at users.sourceforge.net
Tue Mar 22 09:50:32 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19255

Modified Files:
	input.cpp 
Log Message:
Proper check

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- input.cpp	19 Mar 2005 02:54:02 -0000	2.21
+++ input.cpp	22 Mar 2005 17:49:41 -0000	2.22
@@ -332,7 +332,7 @@
 			_lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY);
 		else 
 		// Skip talk 
-		if (_version >= 5 && _talkDelay > 0) 
+		if (VAR_TALKSTOP_KEY != 0xFF && _talkDelay > 0) 
 			_lastKeyHit = (uint)VAR(VAR_TALKSTOP_KEY);
 		else
 		// Escape





More information about the Scummvm-git-logs mailing list