From 44cb88cab87f3fed944605a8e46f9d2e0f9cf0e2 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 3 Feb 2006 09:31:07 +0000
Subject: Remove unused sprite flag, which is never set. Remove leftover
 argument.

svn-id: r20356
---
 scumm/sprite_he.cpp |  7 +++----
 scumm/sprite_he.h   |  1 -
 scumm/wiz_he.cpp    | 18 +++++++++---------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index d1b6139b50..9bb0c62b6f 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -1105,7 +1105,7 @@ void Sprite::resetBackground() {
 					}
 					refreshScreen = true;
 				}
-				if (!(spi->flags & (kSFNeedRedraw | kSF30)) && spi->image)
+				if (!(spi->flags & kSFNeedRedraw) && spi->image)
 					spi->flags |= kSFNeedRedraw;
 			}
 		}
@@ -1119,7 +1119,7 @@ void Sprite::setRedrawFlags(bool checkZOrder) {
 	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 @@ void Sprite::sortActiveSprites() {
 
 		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;
 			}
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index 6cc1db7562..1f3a004434 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -38,7 +38,6 @@ enum SpriteFlags {
 	kSFAutoAnim          = 0x200000,
 	kSFMarkDirty         = 0x400000,
 	kSFBlitDirectly      = 0x2000000,
-	kSF30                = 0x20000000,
 	kSFImageless         = 0x40000000
 };
 
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp
index f26a442756..a77e9eac99 100644
--- a/scumm/wiz_he.cpp
+++ b/scumm/wiz_he.cpp
@@ -739,8 +739,8 @@ void Wiz::computeRawWizHistogram(uint32 *histogram, const uint8 *data, int srcPi
 	}
 }
 
-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 @@ static int wizPackType1(uint8 *dst, const uint8 *src, int srcPitch, const Common
 					runCountDiff = 0;
 				}
 				++runCountSame;
-				if (prevColor == tColor) {
+				if (prevColor == transColor) {
 					if (runCountSame == 0x7F) {
 						if (dst) {
 							*dst++ = (runCountSame << 1) | 1;
@@ -799,7 +799,7 @@ static int wizPackType1(uint8 *dst, const uint8 *src, int srcPitch, const Common
 				}
 			} else {
 				if (runCountSame != 0) {
-					if (prevColor == tColor) {
+					if (prevColor == transColor) {
 						if (dst) {
 							*dst++ = (runCountSame << 1) | 1;
 						}
@@ -828,7 +828,7 @@ static int wizPackType1(uint8 *dst, const uint8 *src, int srcPitch, const Common
 			prevColor = color;
 		}
 		if (runCountSame != 0) {
-			if (prevColor == tColor) {
+			if (prevColor == transColor) {
 				if (dst) {
 					*dst++ = (runCountSame << 1) | 1;
 				}
@@ -858,8 +858,8 @@ static int wizPackType1(uint8 *dst, const uint8 *src, int srcPitch, const Common
 	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 @@ void Wiz::captureWizImage(int resNum, const Common::Rect& r, bool backBuffer, in
 		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 @@ void Wiz::captureWizImage(int resNum, const Common::Rect& r, bool backBuffer, in
 		// 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);
-- 
cgit v1.2.3