[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm native.h,1.2,1.3 proc3.cpp,1.2,1.3

[Chris Apers]

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

Modified Files:
	native.h proc3.cpp 
Log Message:
New params

Index: native.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/native.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- native.h	6 Oct 2004 09:35:02 -0000	1.2
+++ native.h	11 Oct 2004 13:27:13 -0000	1.3
@@ -108,8 +108,9 @@
 	byte _scaleY;
 	int32 _numStrips;
 
-	int _outwidth;
-	int _outheight;
+	int _out_pitch;
+	int _out_w;
+	int _out_h;
 
 	byte *_shadow_table;
 	byte *_palette;

Index: proc3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/proc3.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- proc3.cpp	6 Oct 2004 09:36:01 -0000	1.2
+++ proc3.cpp	11 Oct 2004 13:27:13 -0000	1.3
@@ -22,8 +22,9 @@
 	SET8	(byte			,_scaleX					)
 	SET8	(byte			,_scaleY					)
 	SET32	(int32			,_numStrips					)
-	SET32	(int			,_outwidth					)
-	SET32	(int			,_outheight					)
+	SET32	(int			,_out_pitch					)
+	SET32	(int			,_out_w						)
+	SET32	(int			,_out_h						)
 	SETPTR	(byte *			,_shadow_table				)
 	SETPTR	(byte *			,_palette					)
 	SET8	(byte			,_shadow_mode				)
@@ -74,7 +75,7 @@
 
 		do {
 			if (_scaleY == 255 || *scaleytab++ < _scaleY) {
-				masked = (y < 0 || y >= _outheight) || (v1.mask_ptr && (mask[0] & maskbit));
+				masked = (y < 0 || y >= _out_h) || (v1.mask_ptr && (mask[0] & maskbit));
 
 				if (color && !masked) {
 					// FIXME: Fully implement _shadow_mode.in Sam & Max
@@ -88,7 +89,7 @@
 					}
 					*dst = pcolor;
 				}
-				dst += _outwidth;
+				dst += _out_w;
 				mask += _numStrips;
 				y++;
 			}
@@ -104,7 +105,7 @@
 
 				if (_scaleX == 255 || v1.scaletable[_scaleIndexX] < _scaleX) {
 					v1.x += v1.scaleXstep;
-					if (v1.x < 0 || v1.x >= _outwidth)
+					if (v1.x < 0 || v1.x >= _out_w)
 						return _scaleIndexX;
 						//goto end_jump;
 					maskbit = revBitMask[v1.x & 7];