[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.148,1.149 gfx.cpp,2.382,2.383

Chris Apers chrilith at users.sourceforge.net
Fri Dec 10 07:17:06 CET 2004


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

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

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- costume.cpp	25 Nov 2004 23:36:02 -0000	1.148
+++ costume.cpp	10 Dec 2004 15:16:44 -0000	1.149
@@ -409,6 +409,7 @@
 void CostumeRenderer::proc3(Codec1 &v1) {
 #ifdef __PALM_OS__
 	ARM_START(CostumeProc3Type)
+		ARM_INIT(SCUMM_PROC3)
 		ARM_ADDP(v1)
 		ARM_ADDM(revBitMask)
 		ARM_ADDM(_srcptr)
@@ -424,7 +425,7 @@
 		ARM_ADDV(_out_pitch,	_out.pitch)
 		ARM_ADDV(_out_w,		_out.w)
 		ARM_ADDV(_out_h,		_out.h)
-		PCE_CALL_RETURN(PNO_COSTUMEPROC3, ARM_DATA(), _scaleIndexX)
+		ARM_CALL_RETURN(ARM_ENGINE, PNO_DATA(), _scaleIndexX)
 	ARM_END()
 #endif
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.382
retrieving revision 2.383
diff -u -d -r2.382 -r2.383
--- gfx.cpp	27 Nov 2004 17:50:21 -0000	2.382
+++ gfx.cpp	10 Dec 2004 15:16:45 -0000	2.383
@@ -482,6 +482,7 @@
 
 #ifdef __PALM_OS__
 	ARM_START(DrawStripType)
+		ARM_INIT(SCUMM_DRAWSTRIP)
 		ARM_ADDM(width)
 		ARM_ADDM(height)
 		ARM_ADDM(src)
@@ -490,7 +491,7 @@
 		ARM_ADDV(_vm_screenWidth, _vm->_screenWidth)
 		ARM_ADDV(vs_pitch, vs->pitch)
 		ARM_ADDV(_textSurface_pitch, _textSurface.pitch)
-		PCE_CALL(PNO_DRAWSTRIP, ARM_DATA())
+		ARM_CALL(ARM_ENGINE, PNO_DATA())
 	ARM_CONTINUE()
 #endif
 	// Compose the text over the game graphics





More information about the Scummvm-git-logs mailing list