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

Chris Apers chrilith at users.sourceforge.net
Tue Nov 9 03:49:03 CET 2004


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

Modified Files:
	extend.cpp extend.h 
Log Message:

- ARM call functions moved to init_arm.cpp
- Added new operators
- cleanup

Index: extend.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/extend.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- extend.cpp	6 Oct 2004 09:44:09 -0000	1.10
+++ extend.cpp	9 Nov 2004 11:48:12 -0000	1.11
@@ -25,7 +25,7 @@
 
 #include "extend.h"
 #include "globals.h"
-#include "starterrsc.h"
+#include "enginersc.h"
 
 #include "arm/native.h"
 
@@ -107,40 +107,17 @@
 	return occurences;
 }
 
-MemPtr _PceInit(DmResID resID) {
-	MemHandle armH = DmGetResource('ARMC', resID);
-	NativeFuncType *armP = (NativeFuncType *)MemHandleLock(armH);
-
-	return armP;
-}
-
-UInt32 _PceCall(void *armP, void *userDataP) {
-	return PceNativeCall((NativeFuncType *)armP, userDataP);
-}
 
-void _PceFree(void *armP) {
-	MemHandle armH = MemPtrRecoverHandle(armP);
-
-	MemPtrUnlock(armP);
-	DmReleaseResource(armH);
-}
-
-MemPtr _PnoInit(DmResID resID, PnoDescriptor *pnoP) {
-	MemHandle armH = DmGetResource('ARMC', resID);
-	MemPtr armP = MemHandleLock(armH);
-	PnoLoad(pnoP, armP);
-
-	return armP;
-}
-
-UInt32 _PnoCall(PnoDescriptor *pnoP, void *userDataP) {
-	return PnoCall(pnoP, userDataP);
+// This is now required since some classes are now very big :)
+#include "MemGlue.h"
+void *operator new(UInt32 size) {
+	void *ptr = MemGluePtrNew(size);
+	MemSet(ptr, 0, size);
+	return ptr;
 }
 
-void _PnoFree(PnoDescriptor *pnoP, MemPtr armP) {
-	MemHandle armH = MemPtrRecoverHandle(armP);
-
-	PnoUnload(pnoP);
-	MemPtrUnlock(armP);
-	DmReleaseResource(armH);
+void *operator new [] (UInt32 size) {
+	void *ptr = MemGluePtrNew(size);
+	MemSet(ptr, 0, size);
+	return ptr;
 }

Index: extend.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/extend.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- extend.h	25 May 2004 13:13:20 -0000	1.14
+++ extend.h	9 Nov 2004 11:48:12 -0000	1.15
@@ -26,9 +26,8 @@
 extern const Char *SCUMMVM_SAVEPATH;
 
 int main(int argc, char **argv);
-
 UInt16 StrReplace(Char *ioStr, UInt16 inMaxLen, const Char *inParamStr, const Char *fndParamStr);
-
 void PalmFatalError(const Char *err);
+void DrawStatus(Boolean show);
 
 #endif





More information about the Scummvm-git-logs mailing list