[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.397,1.398 scumm.cpp,1.27,1.28

[Nicolas Bacca]

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

Modified Files:
	scumm.h scumm.cpp 
Log Message:
Remove unnecessary WinCE tweaks

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -d -r1.397 -r1.398
--- scumm.h	26 Apr 2004 19:22:26 -0000	1.397
+++ scumm.h	30 May 2004 13:03:34 -0000	1.398
@@ -87,7 +87,6 @@
 	NUM_LOCALSCRIPT = 60,
 	NUM_SENTENCE = 6,
 	NUM_SHADOW_PALETTE = 8,
-	KEY_SET_OPTIONS = 3456, // WinCE
 	KEY_ALL_SKIP = 3457   // WinCE
 };
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- scumm.cpp	26 May 2004 17:09:12 -0000	1.27
+++ scumm.cpp	30 May 2004 13:03:35 -0000	1.28
@@ -1834,26 +1834,18 @@
 	}
 
 #ifdef _WIN32_WCE
-	if (_lastKeyHit == KEY_SET_OPTIONS) {
-		//_newgui->optionsDialog();
-		return;
-	}
-
 	if (_lastKeyHit == KEY_ALL_SKIP) {
 		// Skip cutscene
 		if (smushMode) {
-			// Eek this is literally shouting for trouble...
-			// Probably should set _lastKey to VAR_CUTSCENEEXIT_KEY instead!
-			_videoFinished = true;
-			return;
+			_lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY);
 		}
 		else
 		if (vm.cutScenePtr[vm.cutSceneStackPointer])
-			_lastKeyHit = (uint16)VAR(VAR_CUTSCENEEXIT_KEY);
+			_lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY);
 		else 
 		// Skip talk 
 		if (_talkDelay > 0) 
-			_lastKeyHit = (uint16)VAR(VAR_TALKSTOP_KEY);
+			_lastKeyHit = (uint)VAR(VAR_TALKSTOP_KEY);
 		else
 		// Escape
 			_lastKeyHit = 27;