[Scummvm-cvs-logs] CVS: scummvm/backends/wince smartphone.cpp,1.7,1.8

Nicolas Bacca arisme at users.sourceforge.net
Sun Jul 13 05:38:07 CEST 2003


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

Modified Files:
	smartphone.cpp 
Log Message:
Fix save key (EGA games)

Index: smartphone.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/smartphone.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smartphone.cpp	8 Jul 2003 22:44:45 -0000	1.7
+++ smartphone.cpp	13 Jul 2003 12:37:16 -0000	1.8
@@ -58,6 +58,7 @@
 extern TCHAR* getGameName(int);
 extern Engine *engine;
 extern bool is_simon;
+extern bool is_bass;
 extern bool sound_activated;
 extern void Cls();
 
@@ -295,21 +296,31 @@
 
 
 void SmartfonSave(OSystem_WINCE3 *wm, BOOL repeat) {
+		if (is_simon)
+			return;
 
 		wm->_event.event_code = OSystem::EVENT_KEYDOWN;
-		if (g_scumm->_features & GF_OLD256)
+		if (is_bass)
+			wm->_event.kbd.ascii = 63;
+		else
+		if (g_scumm->_version <= 2)
+			wm->_event.kbd.ascii = 5;
+		else
+		if ((g_scumm->_features & GF_OLD256) || (g_scumm->_gameId == GID_CMI) || (g_scumm->_features & GF_16COLOR))
 			wm->_event.kbd.ascii = 319;
 		else
-			wm->_event.kbd.ascii = g_scumm->VAR_SAVELOADDIALOG_KEY;
+			wm->_event.kbd.ascii = g_scumm->VAR(g_scumm->VAR_SAVELOADDIALOG_KEY);
 }
 
 void SmartfonSkip(OSystem_WINCE3 *wm, BOOL repeat) {
 
-		if (is_simon) {
+
+		wm->_event.event_code = OSystem::EVENT_KEYDOWN;
+		if (is_simon || is_bass) {
 			wm->_event.kbd.ascii = VK_ESCAPE;
 			return;
 		}
-		wm->_event.event_code = OSystem::EVENT_KEYDOWN;
+		/*
 		if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer] || g_scumm->_insaneState)
 			wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY];
 		else 
@@ -317,6 +328,8 @@
 			wm->_event.kbd.ascii = g_scumm->VAR_TALKSTOP_KEY;						
 		else
 			wm->_event.kbd.ascii = VK_ESCAPE;						
+		*/
+		wm->_event.kbd.ascii = KEY_ALL_SKIP;
 }
 
 void SmartfonBoss(OSystem_WINCE3 *wm, BOOL repeat) {





More information about the Scummvm-git-logs mailing list