From 40a13df5b2107cf9f61ce4fcc6a81bdd9145538a Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Mon, 11 Oct 2004 13:27:13 +0000
Subject: New params

svn-id: r15517
---
 backends/PalmOS/Src/arm/native.h  |  5 +++--
 backends/PalmOS/Src/arm/proc3.cpp | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'backends')

diff --git a/backends/PalmOS/Src/arm/native.h b/backends/PalmOS/Src/arm/native.h
index 85e51a5730..5bd89d103c 100644
--- a/backends/PalmOS/Src/arm/native.h
+++ b/backends/PalmOS/Src/arm/native.h
@@ -108,8 +108,9 @@ typedef struct {
 	byte _scaleY;
 	int32 _numStrips;
 
-	int _outwidth;
-	int _outheight;
+	int _out_pitch;
+	int _out_w;
+	int _out_h;
 
 	byte *_shadow_table;
 	byte *_palette;
diff --git a/backends/PalmOS/Src/arm/proc3.cpp b/backends/PalmOS/Src/arm/proc3.cpp
index 0e0aec4d2b..650d05ab37 100644
--- a/backends/PalmOS/Src/arm/proc3.cpp
+++ b/backends/PalmOS/Src/arm/proc3.cpp
@@ -22,8 +22,9 @@ UInt32 CostumeRenderer_proc3(void *userData68KP) {
 	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 @@ UInt32 CostumeRenderer_proc3(void *userData68KP) {
 
 		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 @@ UInt32 CostumeRenderer_proc3(void *userData68KP) {
 					}
 					*dst = pcolor;
 				}
-				dst += _outwidth;
+				dst += _out_w;
 				mask += _numStrips;
 				y++;
 			}
@@ -104,7 +105,7 @@ UInt32 CostumeRenderer_proc3(void *userData68KP) {
 
 				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];
-- 
cgit v1.2.3