[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.67,1.68 scummvm.cpp,2.294,2.295

[Nicolas Bacca]

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

Modified Files:
	debugger.cpp scummvm.cpp 
Log Message:
Fix for #775275 : debugger support on WinCE

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- debugger.cpp	14 Jul 2003 12:48:46 -0000	1.67
+++ debugger.cpp	21 Jul 2003 22:25:49 -0000	1.68
@@ -35,6 +35,10 @@
 	#define Debug_Printf printf
 #endif
 
+#ifdef _WIN32_WCE
+extern void force_keyboard(bool);
+#endif
+
 extern uint16 _debugLevel;
 
 ScummDebugger::ScummDebugger() {
@@ -48,6 +52,11 @@
 
 // Initialisation Functions
 void ScummDebugger::attach(Scumm *s, char *entry) {
+
+#ifdef _WIN32_WCE
+	force_keyboard(true);
+#endif
+
 	if (_s)
 		detach();
 
@@ -112,6 +121,10 @@
 		_s->_debuggerDialog->setInputeCallback(0, 0);
 		_s->_debuggerDialog->setCompletionCallback(0, 0);
 	}
+#endif
+
+#ifdef _WIN32_WCE
+	force_keyboard(false);
 #endif
 
 	_s->_debugger = NULL;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.294
retrieving revision 2.295
diff -u -d -r2.294 -r2.295
--- scummvm.cpp	21 Jul 2003 21:59:07 -0000	2.294
+++ scummvm.cpp	21 Jul 2003 22:25:49 -0000	2.295
@@ -52,14 +52,14 @@
 #include <sys/stat.h>
 #endif
 
-#ifdef _WIN32_WCE
-extern void drawError(char*);
-#endif
-
 #ifdef _MSC_VER
 #	pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
 #endif
 
+#ifdef _WIN32_WCE
+extern bool isSmartphone(void);
+#endif
+
 // Use g_scumm from error() ONLY
 Scumm *g_scumm = 0;
 ScummDebugger *g_debugger;
@@ -1128,10 +1128,8 @@
 }
 
 int Scumm::scummLoop(int delta) {
-#ifndef _WIN32_WCE
 	if (_debugger)
 		_debugger->on_frame();
-#endif
 
 	// Randomize the PRNG by calling it at regular intervals. This ensures
 	// that it will be in a different state each time you run the program.
@@ -2372,6 +2370,11 @@
 	} else {
 		strcpy(buf2, buf1);
 	}
+
+#ifdef _WIN32_WCE
+	if (isSmartphone())
+		return;
+#endif
 
 	// Unless an error -originated- within the debugger, spawn the debugger. Otherwise
 	// exit out normally.