[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.295,2.296

Max Horn fingolfin at users.sourceforge.net
Mon Jul 21 18:04:06 CEST 2003


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

Modified Files:
	scummvm.cpp 
Log Message:
fix for bug #770704

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.295
retrieving revision 2.296
diff -u -d -r2.295 -r2.296
--- scummvm.cpp	21 Jul 2003 22:25:49 -0000	2.295
+++ scummvm.cpp	22 Jul 2003 01:03:10 -0000	2.296
@@ -1626,6 +1626,12 @@
 			_videoFinished = true;
 		} else
 			abortCutscene();
+		if (_version <= 2) {
+			// Ensure that the input script also sees the key press.
+			// This is necessary so you can abort the airplane travel
+			// in Zak.
+			VAR(VAR_KEYPRESS) = VAR(VAR_CUTSCENEEXIT_KEY);
+		}
 	} else if (_lastKeyHit == saveloadkey) {
 		if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
 			runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);





More information about the Scummvm-git-logs mailing list