[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm proc3.cpp,1.1,1.2
Chris Apers
chrilith at users.sourceforge.net
Wed Oct 6 05:08:28 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm blit.cpp,NONE,1.1 blit.h,NONE,1.1 PNOMain.cpp,1.4,1.5 native.h,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/missing math.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2341
Modified Files:
proc3.cpp
Log Message:
Not needed anymore
Index: proc3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/proc3.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- proc3.cpp 12 Sep 2004 12:42:07 -0000 1.1
+++ proc3.cpp 6 Oct 2004 09:36:01 -0000 1.2
@@ -25,7 +25,6 @@
SET32 (int ,_outwidth )
SET32 (int ,_outheight )
SETPTR (byte * ,_shadow_table )
- SETPTR (byte * ,_vm_proc_special_palette )
SETPTR (byte * ,_palette )
SET8 (byte ,_shadow_mode )
@@ -70,7 +69,6 @@
len = *src++;
color = len >> v1.shr;
len &= v1.mask;
-
if (!len)
len = *src++;
@@ -82,7 +80,7 @@
// FIXME: Fully implement _shadow_mode.in Sam & Max
// For now, it's enough for transparency.
if (_shadow_mode & 0x20) {
- pcolor = _vm_proc_special_palette[*dst];
+ pcolor = _shadow_table[*dst];
} else {
pcolor = _palette[color];
if (pcolor == 13 && _shadow_table)
@@ -96,7 +94,8 @@
}
if (!--height) {
if (!--v1.skip_width)
- goto end_jump;
+ return _scaleIndexX;
+ //goto end_jump;
height = _height;
y = v1.y;
@@ -106,7 +105,8 @@
if (_scaleX == 255 || v1.scaletable[_scaleIndexX] < _scaleX) {
v1.x += v1.scaleXstep;
if (v1.x < 0 || v1.x >= _outwidth)
- goto end_jump;
+ return _scaleIndexX;
+ //goto end_jump;
maskbit = revBitMask[v1.x & 7];
v1.destptr += v1.scaleXstep;
}
@@ -118,9 +118,9 @@
} while (--len);
} while (1);
-end_jump:
+//end_jump:
// v1comp->x = ByteSwap32(v1.x);
// v1comp->destptr = (byte *)ByteSwap32(v1.destptr);
- return _scaleIndexX;
+// return _scaleIndexX;
}
\ No newline at end of file
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm blit.cpp,NONE,1.1 blit.h,NONE,1.1 PNOMain.cpp,1.4,1.5 native.h,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/missing math.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list