[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src extend.cpp,1.8,1.9

Chris Apers chrilith at users.sourceforge.net
Sun Sep 12 05:03:05 CEST 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23732

Modified Files:
	extend.cpp 
Log Message:
Use the new exit(...) function

Index: extend.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/extend.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- extend.cpp	25 May 2004 13:12:25 -0000	1.8
+++ extend.cpp	12 Sep 2004 12:02:17 -0000	1.9
@@ -27,13 +27,15 @@
 #include "globals.h"
 #include "starterrsc.h"
 
-#include "armnative.h"
+#include "arm/native.h"
 
 const Char *SCUMMVM_SAVEPATH = "/PALM/Programs/ScummVM/Saved/";
 
 void PalmFatalError(const Char *err) {
+	WinSetDrawWindow(WinGetDisplayWindow());
 	WinPalette(winPaletteSetToDefault,0,0,0);
 
+	// unlock to show the alert box
 	if (gVars->screenLocked)
 		WinScreenUnlock();
 	
@@ -42,7 +44,10 @@
 
 	WinEraseWindow();
 	FrmCustomAlert(FrmFatalErrorAlert, err, 0,0);
-	SysReset();
+
+	// relock to prevent crash unloading gfx mode
+	if (gVars->screenLocked)
+		WinScreenLock(winLockDontCare);
 }
 
 
@@ -139,4 +144,3 @@
 	MemPtrUnlock(armP);
 	DmReleaseResource(armH);
 }
-





More information about the Scummvm-git-logs mailing list