[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.273,2.274 scumm.h,1.265,1.266

[Nicolas Bacca]

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

Modified Files:
	scummvm.cpp scumm.h 
Log Message:
Add KEY_ALL_SKIP for WinCE

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.273
retrieving revision 2.274
diff -u -d -r2.273 -r2.274
--- scummvm.cpp	11 Jul 2003 14:54:16 -0000	2.273
+++ scummvm.cpp	12 Jul 2003 10:35:37 -0000	2.274
@@ -1997,6 +1997,24 @@
 		return;
 	}
 
+	if (_lastKeyHit == KEY_ALL_SKIP) {
+		// Skip cutscene
+		if (_insaneState) {
+			_videoFinished = true;
+			return;
+		}
+		else
+		if (vm.cutScenePtr[vm.cutSceneStackPointer])
+			_lastKeyHit = (uint16)VAR(VAR_CUTSCENEEXIT_KEY);
+		else 
+		// Skip talk 
+		if (_talkDelay > 0) 
+			_lastKeyHit = (uint16)VAR(VAR_TALKSTOP_KEY);
+		else
+		// Escape
+			_lastKeyHit = 27;
+	}
+
 	if (VAR_RESTART_KEY != 0xFF && _lastKeyHit == VAR(VAR_RESTART_KEY)) {
 		warning("Restart not implemented");
 		//restart();

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- scumm.h	11 Jul 2003 09:38:46 -0000	1.265
+++ scumm.h	12 Jul 2003 10:35:38 -0000	1.266
@@ -61,7 +61,8 @@
 	NUM_LOCALSCRIPT = 60,
 	NUM_SENTENCE = 6,
 	NUM_SHADOW_PALETTE = 8,
-	KEY_SET_OPTIONS = 3456 // WinCE
+	KEY_SET_OPTIONS = 3456, // WinCE
+	KEY_ALL_SKIP = 3457   // WinCE
 };
 
 /** SCUMM feature flags. */