[Scummvm-cvs-logs] scummvm master -> 7af451f84fa2122aa7df7f09385fac3bc298b250

[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:
7af451f84f SCUMM HE: Fix errorneous clearing of the condition bits


Commit: 7af451f84fa2122aa7df7f09385fac3bc298b250
    https://github.com/scummvm/scummvm/commit/7af451f84fa2122aa7df7f09385fac3bc298b250
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-12T00:33:14+02:00

Commit Message:
SCUMM HE: Fix errorneous clearing of the condition bits

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 361c53f..1320747 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1763,8 +1763,6 @@ void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoB
 		if (layerCmdDataBits & kWCFSubConditionBits) {
 			subConditionBits = READ_LE_UINT32(cmdPtr);
 			cmdPtr += 4;
-		} else {
-			subConditionBits = 0;
 		}
 
 		drawWizImageEx(dst, nestedWizHeader, maskPtr, dstPitch, dstType, dstw, dsth, srcx + xPos, srcy + yPos, srcw, srch,