diff options
| author | Nicolas Bacca | 2002-11-19 08:08:45 +0000 |
|---|---|---|
| committer | Nicolas Bacca | 2002-11-19 08:08:45 +0000 |
| commit | b4f7f1d21fa71b2e18e1f56a6e4c023c3f33e973 (patch) | |
| tree | e1712a712af26d90fff9a1d56979cd7e1e0b25b5 /scumm | |
| parent | 80d32ec5e1b075ff655ccf1f33294cd1f6fbfcec (diff) | |
| download | scummvm-rg350-b4f7f1d21fa71b2e18e1f56a6e4c023c3f33e973.tar.gz scummvm-rg350-b4f7f1d21fa71b2e18e1f56a6e4c023c3f33e973.tar.bz2 scummvm-rg350-b4f7f1d21fa71b2e18e1f56a6e4c023c3f33e973.zip | |
Change error display for WinCE
svn-id: r5605
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 91b58a8a31..6e7e81a9aa 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -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 @@ void NORETURN CDECL error(const char *s, ...) 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 @@ void NORETURN CDECL error(const char *s, ...) 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 @@ void NORETURN CDECL error(const char *s, ...) #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 } |