[Scummvm-cvs-logs] CVS: scummvm costume.h,1.2,1.3 costume.cpp,1.41,1.42

Max Horn fingolfin at users.sourceforge.net
Sat Aug 3 17:05:18 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv11587

Modified Files:
	costume.h costume.cpp 
Log Message:
I poked thru old versions of ScummVM, and in the end found out the truth about _transEffect - it's simply _shadowPalette! Thus, got rid of all references to it, and use _shadow_table in the CostumeRenderer class instead. Now somebody please test this for me :-)

Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- costume.h	18 Jul 2002 18:42:51 -0000	1.2
+++ costume.h	4 Aug 2002 00:04:50 -0000	1.3
@@ -81,7 +81,6 @@
 	byte _repcolor;
 	byte _replen;
 	byte _palette[32];
-	byte _transEffect[0x100];
 
 	void proc6();
 	void proc5();

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- costume.cpp	28 Jul 2002 13:31:37 -0000	1.41
+++ costume.cpp	4 Aug 2002 00:04:50 -0000	1.42
@@ -360,21 +360,20 @@
 
 void CostumeRenderer::proc6()
 {
-	byte len;
 	byte *src, *dst;
-	byte width, height, pcolor;
-	int color;
+	byte len, height, pcolor, width;
 	uint y;
+	int color;
 	uint scrheight;
 
 	y = _ypos;
-	len = _replen;
 	src = _srcptr;
 	dst = _backbuff_ptr;
+	len = _replen;
 	color = _repcolor;
+	height = _height2;
 	scrheight = _outheight;
 	width = _width2;
-	height = _height2;
 
 	if (_docontinue)
 		goto StartPos;
@@ -390,7 +389,7 @@
 			if (color && y < scrheight) {
 				pcolor = _palette[color];
 				if (pcolor == 13) {
-					pcolor = _transEffect[*dst];
+					pcolor = _shadow_table[*dst];
 				}
 				*dst = pcolor;
 			}
@@ -423,8 +422,8 @@
 	dst = _backbuff_ptr;
 	len = _replen;
 	color = _repcolor;
-	scrheight = _outheight;
 	height = _height2;
+	scrheight = _outheight;
 
 	if (_docontinue)
 		goto StartPos;
@@ -440,7 +439,7 @@
 			if (color && y < scrheight && !(*mask & maskbit)) {
 				pcolor = _palette[color];
 				if (pcolor == 13)
-					pcolor = _transEffect[*dst];
+					pcolor = _shadow_table[*dst];
 				*dst = pcolor;
 			}
 			dst += 320;
@@ -486,8 +485,8 @@
 	dst = _backbuff_ptr;
 	len = _replen;
 	color = _repcolor;
-	scrheight = _outheight;
 	height = _height2;
+	scrheight = _outheight;
 
 	if (_docontinue)
 		goto StartPos;
@@ -503,7 +502,7 @@
 			if (color && y < scrheight && !((*mask | mask[_imgbufoffs]) & maskbit)) {
 				pcolor = _palette[color];
 				if (pcolor == 13)
-					pcolor = _transEffect[*dst];
+					pcolor = _shadow_table[*dst];
 				*dst = pcolor;
 			}
 			dst += 320;
@@ -543,14 +542,14 @@
 	uint y;
 
 	mask = _mask_ptr_dest;
+	maskbit = revBitMask[_xpos & 7];
+	y = _ypos;
+	src = _srcptr;
 	dst = _backbuff_ptr;
-	height = _height2;
-	width = _width2;
 	len = _replen;
 	color = _repcolor;
-	src = _srcptr;
-	maskbit = revBitMask[_xpos & 7];
-	y = _ypos;
+	height = _height2;
+	width = _width2;
 
 	if (_docontinue)
 		goto StartPos;
@@ -561,12 +560,13 @@
 		len &= _maskval;
 		if (!len)
 			len = *src++;
+
 		do {
 			if (cost_scaleTable[_scaleIndexY++] < _scaleY) {
 				if (color && y < _outheight && !((*mask | mask[_imgbufoffs]) & maskbit)) {
 					pcolor = _palette[color];
 					if (pcolor == 13)
-						pcolor = _transEffect[*dst];
+						pcolor = _shadow_table[*dst];
 					*dst = pcolor;
 				}
 				dst += 320;
@@ -604,14 +604,14 @@
 	uint y;
 
 	mask = _mask_ptr_dest;
+	maskbit = revBitMask[_xpos & 7];
+	y = _ypos;
+	src = _srcptr;
 	dst = _backbuff_ptr;
-	height = _height2;
-	width = _width2;
 	len = _replen;
 	color = _repcolor;
-	src = _srcptr;
-	maskbit = revBitMask[_xpos & 7];
-	y = _ypos;
+	height = _height2;
+	width = _width2;
 
 	if (_docontinue)
 		goto StartPos;
@@ -622,12 +622,13 @@
 		len &= _maskval;
 		if (!len)
 			len = *src++;
+
 		do {
 			if (cost_scaleTable[_scaleIndexY++] < _scaleY) {
 				if (color && y < _outheight && !(*mask & maskbit)) {
 					pcolor = _palette[color];
 					if (pcolor == 13)
-						pcolor = _transEffect[*dst];
+						pcolor = _shadow_table[*dst];
 					*dst = pcolor;
 				}
 				dst += 320;
@@ -661,20 +662,18 @@
 {
 	byte *mask, *src, *dst, *dstorg;
 	byte maskbit, len, height, pcolor, width;
+	int color, t;
 	uint y;
-	int color;
-	int t;
 
 	mask = _mask_ptr = _mask_ptr_dest;
 	maskbit = revBitMask[_xpos & 7];
 	y = _ypos;
-
+	src = _srcptr;
 	dstorg = dst = _backbuff_ptr;
-	height = _height2;
-	width = _width2;
 	len = _replen;
 	color = _repcolor;
-	src = _srcptr;
+	height = _height2;
+	width = _width2;
 
 	if (_docontinue)
 		goto StartPos;
@@ -691,7 +690,7 @@
 				if (color && y < _outheight) {
 					pcolor = _palette[color];
 					if (pcolor == 13)
-						pcolor = _transEffect[*dst];
+						pcolor = _shadow_table[*dst];
 					*dst = pcolor;
 				}
 				dst += 320;
@@ -748,7 +747,7 @@
 			if (color && x >= 0 && x < 320) {
 				pcolor = _palette[color];
 /*				  if (pcolor == 13) {
-					pcolor = _transEffect[*dst];
+					pcolor = _shadow_table[*dst];
 				}*/
 				*dst = pcolor;
 			}
@@ -798,7 +797,7 @@
 			if (color && x >=0 && x < 320 && !(*mask & maskbit)) {
 				pcolor = _palette[color];
 /*				  if (pcolor == 13)
-					pcolor = _transEffect[*dst];*/
+					pcolor = _shadow_table[*dst];*/
 				*dst = pcolor;
 			}
 			dst += step;
@@ -864,7 +863,7 @@
 			if (color && x >= 0 && x < 320 && !((*mask | mask[_imgbufoffs]) & maskbit)) {
 				pcolor = _palette[color];
 /*				  if (pcolor == 13)
-					pcolor = _transEffect[*dst];*/
+					pcolor = _shadow_table[*dst];*/
 				*dst = pcolor;
 			}
 			dst += step;
@@ -928,7 +927,7 @@
 				if (color && _xpos >= 0 && _xpos < 320 && !((*mask | mask[_imgbufoffs]) & maskbit)) {
 					pcolor = _palette[color];
 /*					  if (pcolor == 13)
-						pcolor = _transEffect[*dst];*/
+						pcolor = _shadow_table[*dst];*/
 					*dst = pcolor;
 				}
 
@@ -993,7 +992,7 @@
 				if (color && _xpos >= 0 && _xpos < 320 && !(*mask & maskbit)) {
 					pcolor = _palette[color];
 /*					  if (pcolor == 13)
-						pcolor = _transEffect[*dst];*/
+						pcolor = _shadow_table[*dst];*/
 					*dst = pcolor;
 				}
 				t = _scaleIndexX;
@@ -1062,7 +1061,7 @@
 				if (color && _xpos >= 0 && _xpos < 320) {
 					pcolor = _palette[color];
 /*					  if (pcolor == 13)
-						pcolor = _transEffect[*dst];*/
+						pcolor = _shadow_table[*dst];*/
 					*dst = pcolor;
 				}
 





More information about the Scummvm-git-logs mailing list