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

Chris Apers chrilith at users.sourceforge.net
Tue May 25 06:13:05 CEST 2004


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

Modified Files:
	extend.cpp 
Log Message:
Moved DrawStatus here, revamped ARM call functions

Index: extend.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/extend.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- extend.cpp	20 Jan 2004 13:59:04 -0000	1.7
+++ extend.cpp	25 May 2004 13:12:25 -0000	1.8
@@ -27,6 +27,8 @@
 #include "globals.h"
 #include "starterrsc.h"
 
+#include "armnative.h"
+
 const Char *SCUMMVM_SAVEPATH = "/PALM/Programs/ScummVM/Saved/";
 
 void PalmFatalError(const Char *err) {
@@ -43,6 +45,27 @@
 	SysReset();
 }
 
+
+void DrawStatus(Boolean show) {
+	if (OPTIONS_TST(kOptDisableOnScrDisp))
+		return;
+
+	UInt8 x,y;
+	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++)
+			screen[x] = color;
+
+		screen += gVars->screenPitch;
+	}
+}
+
 UInt16 StrReplace(Char *ioStr, UInt16 inMaxLen, const Char *inParamStr, const Char *fndParamStr) {
 	Char *found;
 	Boolean quit = false;
@@ -78,39 +101,42 @@
 
 	return occurences;
 }
-/*
-UInt32 PceNativeRsrcCall(DmResID resID, void *userDataP) {
-	PnoDescriptor pno;
-	
+
+MemPtr _PceInit(DmResID resID) {
 	MemHandle armH = DmGetResource('ARMC', resID);
-	MemPtr pnoPtr = MemHandleLock(armH);
+	NativeFuncType *armP = (NativeFuncType *)MemHandleLock(armH);
 
-//	UInt32 result = PceNativeCall((NativeFuncType*)armP, userDataP);
-	PnoLoad(&pno, pnoPtr);
-	UInt32 result = PnoCall(&pno, userDataP);
-	PnoUnload(&pno);
+	return armP;
+}
 
-	MemHandleUnlock(armH);
-	DmReleaseResource(armH);
+UInt32 _PceCall(void *armP, void *userDataP) {
+	return PceNativeCall((NativeFuncType *)armP, userDataP);
+}
 
-	return result;
-}*/
-UInt32 PceNativeRsrcCall(PnoDescriptor *pno, void *userDataP) {
-	return PnoCall(pno, userDataP);;
+void _PceFree(void *armP) {
+	MemHandle armH = MemPtrRecoverHandle(armP);
+
+	MemPtrUnlock(armP);
+	DmReleaseResource(armH);
 }
 
-MemPtr PceNativeCallInit(DmResID resID, PnoDescriptor *pno) {
+MemPtr _PnoInit(DmResID resID, PnoDescriptor *pnoP) {
 	MemHandle armH = DmGetResource('ARMC', resID);
-	MemPtr pnoPtr = MemHandleLock(armH);
-	PnoLoad(pno, pnoPtr);
+	MemPtr armP = MemHandleLock(armH);
+	PnoLoad(pnoP, armP);
 
-	return pnoPtr;
+	return armP;
 }
 
-void PceNativeCallRelease(PnoDescriptor *pno, MemPtr ptr) {
-	MemHandle h = MemPtrRecoverHandle(ptr);
+UInt32 _PnoCall(PnoDescriptor *pnoP, void *userDataP) {
+	return PnoCall(pnoP, userDataP);;
+}
 
-	PnoUnload(pno);
-	MemPtrUnlock(ptr);
-	DmReleaseResource(h);
+void _PnoFree(PnoDescriptor *pnoP, MemPtr armP) {
+	MemHandle armH = MemPtrRecoverHandle(armP);
+
+	PnoUnload(pnoP);
+	MemPtrUnlock(armP);
+	DmReleaseResource(armH);
 }
+





More information about the Scummvm-git-logs mailing list