[Scummvm-cvs-logs] scummvm master -> dd2e7be0a601095ffebbfabe8b140edbdb58a3c2

[sev-]

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

Summary:
dd2e7be0a6 SCUMM HE: Remove redundant debug output


Commit: dd2e7be0a601095ffebbfabe8b140edbdb58a3c2
    https://github.com/scummvm/scummvm/commit/dd2e7be0a601095ffebbfabe8b140edbdb58a3c2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-13T23:08:21+02:00

Commit Message:
SCUMM HE: Remove redundant debug output

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 c123240..43994c3 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1615,10 +1615,6 @@ void Wiz::drawWizImageEx(uint8 *dst, uint8 *dataPtr, uint8 *maskPtr, int dstPitc
 	uint8 *wizd = _vm->findWrappedBlock(MKTAG('W','I','Z','D'), dataPtr, state, 0);
 	assert(wizd);
 
-	if (srcw == srch && srcw == 30) {
-		warning("FOG: comp %d bits: %x", comp, conditionBits);
-	}
-
 	switch (comp) {
 	case 0:
 		copyRawWizImage(dst, wizd, dstPitch, dstType, dstw, dsth, srcx, srcy, srcw, srch, rect, flags, palPtr, transColor, bitDepth);
@@ -1686,20 +1682,12 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
 		uint32 layerCmdDataBits = READ_LE_UINT32(cmdPtr);
 		cmdPtr += 4;
 
-		if (srcw == srch && srcw == 30) {
-			warning("layerbits: %x", layerCmdDataBits);
-		}
-
 		uint32 subConditionBits;
 
 		if (layerCmdDataBits & kWCFConditionBits) {
 			uint32 layerConditionBits = READ_LE_UINT32(cmdPtr);
 			cmdPtr += 4;
 
-			if (srcw == srch && srcw == 30) {
-				warning("layercondbits: %x", layerConditionBits);
-			}
-
 			subConditionBits = (layerConditionBits & kWMSBReservedBits);
 			layerConditionBits &= ~kWMSBReservedBits;
 
@@ -1733,9 +1721,6 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
 		uint16 subState;
 		if (layerCmdDataBits & kWCFSubState) {
 			subState = READ_LE_UINT16(cmdPtr);
-			if (srcw == srch && srcw == 30) {
-				warning("state: %x substate: %x", state, subState);
-			}
 			cmdPtr += 2;
 		} else {
 			subState = 0;
@@ -1784,10 +1769,6 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
 			cmdPtr += 4;
 		}
 
-		if (srcw == srch && srcw == 30) {
-			warning("subBits: %x", subConditionBits);
-		}
-
 		drawWizImageEx(dst, nestedWizHeader, maskPtr, dstPitch, dstType, dstw, dsth, srcx + xPos, srcy + yPos, srcw, srch,
 			subState, clipBox, drawFlags, palPtr, transColor, bitDepth, xmapPtr, subConditionBits);
 	}