[Scummvm-cvs-logs] scummvm master -> 6f731eb143c1588f864f0854a6b216dff4b43376

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
38cd94f448 SCUMM HE: Added Composite Wiz images to pixel detection
6f731eb143 SCUMM HE: Hid debug output deeper


Commit: 38cd94f448babfde0da1275a2f013b6300f89324
    https://github.com/scummvm/scummvm/commit/38cd94f448babfde0da1275a2f013b6300f89324
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-04T11:34:55+02:00

Commit Message:
SCUMM HE: Added Composite Wiz images to pixel detection

Changed paths:
    engines/scumm/he/wiz_he.cpp



diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 055df25..3f99223 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -2795,11 +2795,12 @@ int Wiz::isWizPixelNonTransparent(int resNum, int state, int x, int y, int flags
 		case 2:
 			ret = getRawWizPixelColor(wizd, x, y, w, h, 2, _vm->VAR(_vm->VAR_WIZ_TCOLOR)) != _vm->VAR(_vm->VAR_WIZ_TCOLOR) ? 1 : 0;
 			break;
-		case 4:
-			// TODO: Unknown image type
-			ret = 1;
-			debug(0, "isWizPixelNonTransparent: Unhandled wiz compression type %d", c);
+		case 4: {
+			uint16 color = 0xffff;
+			copyCompositeWizImage((byte *)&color, data, wizd, 0, 2, kDstMemory, 1, 1, -x, -y, w, h, state, 0, 0, 0, 0, 2, 0, 0);
+			ret = color != 0xffff;
 			break;
+		}
 		case 5:
 			ret = isWizPixelNonTransparent(wizd, x, y, w, h, 2);
 			break;
@@ -2839,8 +2840,7 @@ uint16 Wiz::getWizPixelColor(int resNum, int state, int x, int y) {
 		color = getRawWizPixelColor(wizd, x, y, w, h, 2, _vm->VAR(_vm->VAR_WIZ_TCOLOR));
 		break;
 	case 4:
-		// TODO: Unknown image type
-		debug(0, "getWizPixelColor: Unhandled wiz compression type %d", c);
+		copyCompositeWizImage((byte *)&color, data, wizd, 0, 2, kDstMemory, 1, 1, -x, -y, w, h, state, 0, 0, 0, 0, 2, 0, 0);
 		break;
 	case 5:
 		color = getWizPixelColor(wizd, x, y, w, h, 2, _vm->VAR(_vm->VAR_WIZ_TCOLOR));


Commit: 6f731eb143c1588f864f0854a6b216dff4b43376
    https://github.com/scummvm/scummvm/commit/6f731eb143c1588f864f0854a6b216dff4b43376
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-04T12:05:52+02:00

Commit Message:
SCUMM HE: Hid debug output deeper

Changed paths:
    engines/scumm/he/sprite_he.cpp



diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index ecae484..4ca034f 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -746,7 +746,7 @@ void Sprite::setSpriteField84(int spriteId, int value) {
 }
 
 void Sprite::setSpriteGeneralProperty(int spriteId, int type, int value) {
-	debug(0, "setSpriteGeneralProperty: spriteId %d type 0x%x", spriteId, type);
+	debug(4, "setSpriteGeneralProperty: spriteId %d type 0x%x", spriteId, type);
 	assertRange(1, spriteId, _varNumSprites, "sprite");
 	int32 delay;