[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.75,1.76

Nicolas Bacca arisme at users.sourceforge.net
Tue Nov 19 00:09:03 CET 2002


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

Modified Files:
	scummvm.cpp 
Log Message:
Change error display for WinCE

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- scummvm.cpp	15 Nov 2002 12:07:59 -0000	1.75
+++ scummvm.cpp	19 Nov 2002 08:08:45 -0000	1.76
@@ -38,7 +38,7 @@
 #include "string.h"
 
 #ifdef _WIN32_WCE
-extern void GraphicsOff(void);
+extern void drawError(char*);
 #endif
 
 // Use g_scumm from error() ONLY
@@ -1346,9 +1346,6 @@
 	char buf[1024];
 #if defined( USE_WINDBG ) || defined ( _WIN32_WCE )
 	char buf2[1024];
-#if defined( _WIN32_WCE )
-	TCHAR buf2w[2048];
-#endif
 #endif
 
 	va_list va;
@@ -1370,13 +1367,9 @@
 			g_scumm->_scriptPointer - g_scumm->_scriptOrgPointer,
 			buf);
 #if defined ( _WIN32_WCE )	
-/*
-			MultiByteToWideChar(CP_ACP, 0, buf2, strlen(buf2) + 1, buf2w, sizeof(buf2w));
-			GraphicsOff();
-			MessageBox(NULL, buf2w, TEXT("ScummVM error"), MB_OK);
-*/
+		drawError(buf2);
 #else
-			OutputDebugString(buf2);
+		OutputDebugString(buf2);
 #endif
 #endif
 
@@ -1385,13 +1378,9 @@
 #if defined( USE_WINDBG ) || defined( _WIN32_WCE )
 		sprintf(&buf[strlen(buf)], "\n");
 #if defined ( _WIN32_WCE )	
-/*
-			MultiByteToWideChar(CP_ACP, 0, buf, strlen(buf) + 1, buf2w, sizeof(buf2w));
-			GraphicsOff();
-			MessageBox(NULL, buf2w, TEXT("ScummVM error"), MB_OK);
-*/
+		drawError(buf);
 #else
-			OutputDebugString(buf);
+		OutputDebugString(buf);
 #endif
 #endif
 	}





More information about the Scummvm-git-logs mailing list