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

[Chris Apers]

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

Modified Files:
	extend.cpp 
Log Message:
Not needed

Index: extend.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/extend.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- extend.cpp	30 Jul 2005 21:10:48 -0000	1.14
+++ extend.cpp	12 Oct 2005 20:41:00 -0000	1.15
@@ -19,7 +19,7 @@
  * $Header$
  *
  */
-
+ 
 #include <PalmOS.h>
 #include <string.h>
 
@@ -32,20 +32,12 @@
 void PalmFatalError(const Char *err) {
 	WinSetDrawWindow(WinGetDisplayWindow());
 	WinPalette(winPaletteSetToDefault,0,0,0);
-
-	// unlock to show the alert box
-	if (gVars->screenLocked)
-		WinScreenUnlock();
-
+	
 	if (OPTIONS_TST(kOptModeHiDensity))
 		WinSetCoordinateSystem(kCoordinatesStandard);
 
 	WinEraseWindow();
 	FrmCustomAlert(FrmFatalErrorAlert, err, 0,0);
-
-	// relock to prevent crash unloading gfx mode
-	if (gVars->screenLocked)
-		WinScreenLock(winLockDontCare);
 }
 
 
@@ -57,9 +49,6 @@
 	UInt8 *screen = (UInt8 *)(BmpGetBits(WinGetBitmap(WinGetDisplayWindow())));
 	UInt8 color = (show? gVars->indicator.on : gVars->indicator.off);
 
-	if (gVars->screenLocked)
-		screen = (screen == gVars->flipping.pageAddr1) ? gVars->flipping.pageAddr2 : gVars->flipping.pageAddr1;
-
 	screen += gVars->screenPitch + 1;
 	for(y=0; y < 4; y++) {
 		for(x=0; x < 4; x++)
@@ -78,10 +67,10 @@
 	UInt16 l2 = 0;
 	UInt16 l3 = StrLen(ioStr);
 	UInt16 next = 0;
-
+		
 	if (inParamStr)
 		l2 = StrLen(inParamStr); // can be null to know how many occur.
-
+	
 	while (((found = StrStr(ioStr+next, fndParamStr)) != NULL) && (!quit)) {
 		occurences++;
 		newLength = (StrLen(ioStr) - l1 + l2);
@@ -98,7 +87,7 @@
 		} else
 			next = found - ioStr + l1;
 	}
-
+	
 	if (inParamStr)
 		ioStr[l3 + l2*occurences - l1*occurences] = 0;
 
@@ -106,6 +95,8 @@
 }
 
 
+#ifndef PALMOS_ARM
+
 // This is now required since some classes are now very big :)
 #include "MemGlue.h"
 void *operator new(UInt32 size) {
@@ -119,3 +110,25 @@
 	MemSet(ptr, 0, size);
 	return ptr;
 }
+#else
+/*
+__inline void *operator new(UInt32 size) {
+	void *ptr = MemPtrNew(size);
+	MemSet(ptr, 0, size);
+	return ptr;
+}
+
+__inline void *operator new [] (UInt32 size) {
+	void *ptr = MemPtrNew(size);
+	MemSet(ptr, 0, size);
+	return ptr;
+}
+
+__inline void operator delete(void *ptr) throw() {
+	if (ptr) MemPtrFree(ptr);
+}
+
+__inline void operator delete[](void *ptr) throw() {
+	if (ptr) MemPtrFree(ptr);
+}*/
+#endif