[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.h,1.47,1.48 sprite_he.cpp,1.161,1.162 wiz_he.cpp,2.121,2.122

[kirben]

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

Modified Files:
	sprite_he.h sprite_he.cpp wiz_he.cpp 
Log Message:

Remove unused sprite flag, which is never set.
Remove leftover argument.


Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sprite_he.h	27 Jan 2006 06:05:03 -0000	1.47
+++ sprite_he.h	3 Feb 2006 09:31:06 -0000	1.48
@@ -38,7 +38,6 @@
 	kSFAutoAnim          = 0x200000,
 	kSFMarkDirty         = 0x400000,
 	kSFBlitDirectly      = 0x2000000,
-	kSF30                = 0x20000000,
 	kSFImageless         = 0x40000000
 };
 

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- sprite_he.cpp	31 Jan 2006 01:06:04 -0000	1.161
+++ sprite_he.cpp	3 Feb 2006 09:31:06 -0000	1.162
@@ -1105,7 +1105,7 @@
 					}
 					refreshScreen = true;
 				}
-				if (!(spi->flags & (kSFNeedRedraw | kSF30)) && spi->image)
+				if (!(spi->flags & kSFNeedRedraw) && spi->image)
 					spi->flags |= kSFNeedRedraw;
 			}
 		}
@@ -1119,7 +1119,7 @@
 	VirtScreen *vs = &_vm->virtscr[kMainVirtScreen];
 	for (int i = 0; i < _numSpritesToProcess; ++i) {
 		SpriteInfo *spi = _activeSpritesTable[i];
-		if (!(spi->flags & (kSFNeedRedraw | kSF30))) {
+		if (!(spi->flags & kSFNeedRedraw)) {
 			if ((!checkZOrder || spi->priority >= 0) && (spi->flags & kSFMarkDirty)) {
 				int lp = spi->bbox.left / 8;
 				lp = MAX(0, lp);
@@ -1196,8 +1196,7 @@
 
 		if (spi->flags & kSFActive) {
 			if (!(spi->flags & kSFMarkDirty)) {
-				if (!(spi->flags & kSF30))
-					spi->flags |= kSFNeedRedraw;
+				spi->flags |= kSFNeedRedraw;
 				if (!(spi->flags & kSFImageless))
 					spi->flags |= kSFChanged;
 			}

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.121
retrieving revision 2.122
diff -u -d -r2.121 -r2.122
--- wiz_he.cpp	31 Jan 2006 19:28:19 -0000	2.121
+++ wiz_he.cpp	3 Feb 2006 09:31:07 -0000	2.122
@@ -739,8 +739,8 @@
 	}
 }
 
-static int wizPackType1(uint8 *dst, const uint8 *src, int srcPitch, const Common::Rect& rCapt, uint8 tColor) {
-	debug(9, "wizPackType1(%d, [%d,%d,%d,%d])", tColor, rCapt.left, rCapt.top, rCapt.right, rCapt.bottom);
+static int wizPackType1(uint8 *dst, const uint8 *src, int srcPitch, const Common::Rect& rCapt, uint8 transColor) {
+	debug(9, "wizPackType1(%d, [%d,%d,%d,%d])", transColor, rCapt.left, rCapt.top, rCapt.right, rCapt.bottom);
 	src += rCapt.top * srcPitch + rCapt.left;
 	int w = rCapt.width();
 	int h = rCapt.height();
@@ -779,7 +779,7 @@
 					runCountDiff = 0;
 				}
 				++runCountSame;
-				if (prevColor == tColor) {
+				if (prevColor == transColor) {
 					if (runCountSame == 0x7F) {
 						if (dst) {
 							*dst++ = (runCountSame << 1) | 1;
@@ -799,7 +799,7 @@
 				}
 			} else {
 				if (runCountSame != 0) {
-					if (prevColor == tColor) {
+					if (prevColor == transColor) {
 						if (dst) {
 							*dst++ = (runCountSame << 1) | 1;
 						}
@@ -828,7 +828,7 @@
 			prevColor = color;
 		}
 		if (runCountSame != 0) {
-			if (prevColor == tColor) {
+			if (prevColor == transColor) {
 				if (dst) {
 					*dst++ = (runCountSame << 1) | 1;
 				}
@@ -858,8 +858,8 @@
 	return dataSize;
 }
 
-static int wizPackType0(uint8 *dst, const uint8 *src, int srcPitch, const Common::Rect& rCapt, uint8 tColor) {
-	debug(9, "wizPackType0(%d, [%d,%d,%d,%d])", tColor, rCapt.left, rCapt.top, rCapt.right, rCapt.bottom);
+static int wizPackType0(uint8 *dst, const uint8 *src, int srcPitch, const Common::Rect& rCapt) {
+	debug(9, "wizPackType0([%d,%d,%d,%d])", rCapt.left, rCapt.top, rCapt.right, rCapt.bottom);
 	int w = rCapt.width();
 	int h = rCapt.height();
 	int size = w * h;
@@ -902,7 +902,7 @@
 		int headerSize = palPtr ? 1080 : 36;
 		switch (compType) {
 		case 0:
-			dataSize = wizPackType0(0, src, pvs->pitch, rCapt, transColor);
+			dataSize = wizPackType0(0, src, pvs->pitch, rCapt);
 			break;
 		case 1:
 			dataSize = wizPackType1(0, src, pvs->pitch, rCapt, transColor);
@@ -945,7 +945,7 @@
 		// write compressed data
 		switch (compType) {
 		case 0:
-			wizPackType0(wizImg + headerSize, src, pvs->pitch, rCapt, transColor);
+			wizPackType0(wizImg + headerSize, src, pvs->pitch, rCapt);
 			break;
 		case 1:
 			wizPackType1(wizImg + headerSize, src, pvs->pitch, rCapt, transColor);