[Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.78,1.79

Chris Apers chrilith at users.sourceforge.net
Fri Dec 10 07:19:05 CET 2004


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26924

Modified Files:
	display.cpp 
Log Message:
New ARM call (PalmOS)

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- display.cpp	3 Dec 2004 22:39:54 -0000	1.78
+++ display.cpp	10 Dec 2004 15:18:28 -0000	1.79
@@ -566,13 +566,14 @@
 
 #ifdef __PALM_OS__
 	ARM_START(CopyRectangleType)
+		ARM_INIT(COMMON_COPYRECT)
 		ARM_ADDM(dst)
 		ARM_ADDV(buf, src)
 		ARM_ADDV(pitch, BACKDROP_W)
 		ARM_ADDV(_offScreenPitch, SCREEN_W)
 		ARM_ADDV(w, SCREEN_W)
 		ARM_ADDM(h)
-		PNO_CALL(PNO_COPYRECT, ARM_DATA())
+		ARM_CALL(ARM_COMMON, PNO_DATA())
 	ARM_END()
 #endif
 
@@ -690,6 +691,7 @@
 #ifdef __PALM_OS__
 	ARM_CHECK_EXEC(w > 8 && h > 8)
 		ARM_START(BlitType)
+			ARM_INIT(QUEEN_BLIT)
 			ARM_ADDM(dstBuf)
 			ARM_ADDM(dstPitch)
 			ARM_ADDM(srcBuf)
@@ -698,7 +700,7 @@
 			ARM_ADDM(h)
 			ARM_ADDM(xflip)
 			ARM_ADDM(masked)
-			PNO_CALL(PNO_BLIT, ARM_DATA())
+			ARM_CALL(ARM_ENGINE, PNO_DATA())
 		ARM_END()
 	ARM_CHECK_END()
 #endif
@@ -711,9 +713,9 @@
 		}
 	} else if (!xflip) { // Masked bitmap unflipped
 		while (h--) {
-			for (int i = 0; i < w; ++i) {
+			for(int i = 0; i < w; ++i) {
 				uint8 b = *(srcBuf + i);
-				if (b != 0) {
+				if(b != 0) {
 					*(dstBuf + i) = b;
 				}
 			}
@@ -722,9 +724,9 @@
 		}
 	} else { // Masked bitmap flipped
 		while (h--) {
-			for (int i = 0; i < w; ++i) {
+			for(int i = 0; i < w; ++i) {
 				uint8 b = *(srcBuf + i);
-				if (b != 0) {
+				if(b != 0) {
 					*(dstBuf - i) = b;
 				}
 			}





More information about the Scummvm-git-logs mailing list