[Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.19,2.20

kirben kirben at users.sourceforge.net
Mon Mar 14 17:47:20 CET 2005


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

Modified Files:
	input.cpp 
Log Message:

VAR_CUTSCENEEXIT_KEY uses different value in NES maniac


Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- input.cpp	12 Mar 2005 00:47:15 -0000	2.19
+++ input.cpp	15 Mar 2005 01:45:38 -0000	2.20
@@ -400,7 +400,7 @@
 		saveloadkey = VAR(VAR_MAINMENU_KEY);
 
 	if (_lastKeyHit == VAR(VAR_CUTSCENEEXIT_KEY) ||
-		(VAR(VAR_CUTSCENEEXIT_KEY) == 4 && _lastKeyHit == 27)) {
+		((VAR(VAR_CUTSCENEEXIT_KEY) == 4 || VAR(VAR_CUTSCENEEXIT_KEY) == 64) && _lastKeyHit == 27)) {
 		// Skip cutscene (or active SMUSH video). For the V2 games, which
 		// normally use F4 for this, we add in a hack that makes escape work,
 		// too (just for convenience).





More information about the Scummvm-git-logs mailing list