[Scummvm-cvs-logs] CVS: scummvm/backends/wince pocketpc.cpp,1.14,1.15

Nicolas Bacca arisme at users.sourceforge.net
Sun Dec 1 15:47:53 CET 2002


Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1:/tmp/cvs-serv494

Modified Files:
	pocketpc.cpp 
Log Message:
Fix Simon countermeasures :)

Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/pocketpc.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pocketpc.cpp	1 Dec 2002 23:25:33 -0000	1.14
+++ pocketpc.cpp	1 Dec 2002 23:46:19 -0000	1.15
@@ -912,17 +912,17 @@
 
 	/* Start the engine */
 
-	engine = Engine::createFromDetector(&detector, system);
-
-	keypad_init();
-	load_key_mapping();
+	is_simon = (detector._gameId >= GID_SIMON_FIRST);
 
 	if (detector._gameId == GID_SAMNMAX || detector._gameId == GID_FT || detector._gameId == GID_DIG)
 		hide_cursor = FALSE;
 	else
-		hide_cursor = TRUE;
+		hide_cursor = TRUE;	
 
-	is_simon = (detector._gameId >= GID_SIMON_FIRST);
+	engine = Engine::createFromDetector(&detector, system);
+
+	keypad_init();
+	load_key_mapping();
 
 	engine->go();
 
@@ -1460,6 +1460,11 @@
 void action_skip() {
 	OSystem_WINCE3* system;
 	system = (OSystem_WINCE3*)g_scumm->_system;
+
+	if (is_simon) {
+		((SimonState*)engine)->_exit_cutscene = true;
+		return;
+	}
 
 	if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer] || g_scumm->_insaneState)
 		system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY]);





More information about the Scummvm-git-logs mailing list