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

[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:
bb43f5c0f4 SCUMM HE: Fix Moonbase distortion codec
f2f04b5edd SCUMM HE: Removed unneeded warning


Commit: bb43f5c0f4a1e06129ed81a9f0e70862f6345e0b
    https://github.com/scummvm/scummvm/commit/bb43f5c0f4a1e06129ed81a9f0e70862f6345e0b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-15T22:02:55+02:00

Commit Message:
SCUMM HE: Fix Moonbase distortion codec

Changed paths:
    engines/scumm/he/moonbase/distortion.cpp



diff --git a/engines/scumm/he/moonbase/distortion.cpp b/engines/scumm/he/moonbase/distortion.cpp
index 0bef245..6b637d0 100644
--- a/engines/scumm/he/moonbase/distortion.cpp
+++ b/engines/scumm/he/moonbase/distortion.cpp
@@ -152,7 +152,7 @@ void Moonbase::blitDistortion(byte *bufferData, const int bufferWidth, const int
 	clippedDstRect.clip(dstOperation);
 
 	int subBlockCount = READ_LE_UINT16(dataStream + kBptHeaderSize + 4);
-	byte *subBlockStream = dataStream + kBptHeaderSize + READ_LE_UINT16(dataStream) + 2;
+	byte *subBlockStream = dataStream + kBptHeaderSize + READ_LE_UINT32(dataStream + 4);
 	int cx1 = clippedDstRect.left;
 	int cy1 = clippedDstRect.top;
 	int cx2 = clippedDstRect.right - 1;
@@ -190,7 +190,6 @@ void Moonbase::blitDistortion(byte *bufferData, const int bufferWidth, const int
 		int src_x = (x + xOffset);
 		int src_y = (y + yOffset);
 
-		warning("x1: %d y1: %d x2: %d y2: %d", (src_x - l_reach), (src_y - t_reach), (src_x + r_reach), (src_y + b_reach));
 		Common::Rect srcReach((src_x - l_reach), (src_y - t_reach), (src_x + r_reach), (src_y + b_reach));
 		Common::Rect srcLimits(srcBitmap.w, srcBitmap.h);
 


Commit: f2f04b5eddef081a8e31666d6afdcd9bec3dace7
    https://github.com/scummvm/scummvm/commit/f2f04b5eddef081a8e31666d6afdcd9bec3dace7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-15T22:08:08+02:00

Commit Message:
SCUMM HE: Removed unneeded warning

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 b152b40..9339318 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1816,7 +1816,6 @@ void Wiz::copy555WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
 	if (compID == 0x12340102) {
 		((ScummEngine_v100he *)_vm)->_moonbase->blitT14WizImage(dst, dstw, dsth, dstPitch, clipBox, wizd, srcx, srcy, rawROP, paramROP);
 	} else if (compID == 0x12340802) {
-		warning("Distortion codec");
 		((ScummEngine_v100he *)_vm)->_moonbase->blitDistortion(dst, dstw, dsth, dstPitch, clipBox, wizd, srcx, srcy, 0);
 	} else if (compID == 0x12340902) {
 		error("Unsupported Distortion");