[Scummvm-git-logs] scummvm master -> b54767434188242c65ffccbdd479d64f27e7038a

[npjg]

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

Summary:
992b4ab0b8 DIRECTOR: Respect mask in stretched surface blit
cb40fe606e DIRECTOR: Remove extra comparisons from blitter
b547674341 DIRECTOR: Initialize variable


Commit: 992b4ab0b83bebd2f2d649d90c787ff8096f9295
    https://github.com/scummvm/scummvm/commit/992b4ab0b83bebd2f2d649d90c787ff8096f9295
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-24T08:46:25-04:00

Commit Message:
DIRECTOR: Respect mask in stretched surface blit

Changed paths:
    engines/director/stage.cpp


diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index 885cbf2fb3..bb21d822f1 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -280,10 +280,13 @@ void Stage::inkBlitStretchSurface(DirectorPlotData *pd, Common::Rect &srcRect, c
 
 	for (int i = 0, scaleYCtr = 0; i < pd->destRect.height(); i++, scaleYCtr += scaleY, pd->srcPoint.y++) {
 		pd->srcPoint.x = MAX(abs(srcRect.left - pd->destRect.left), 0);
+		const byte *msk = mask ? (const byte *)mask->getBasePtr(pd->srcPoint.x, pd->srcPoint.y) : nullptr;
 
 		for (int xCtr = 0, scaleXCtr = 0; xCtr < pd->destRect.width(); xCtr++, scaleXCtr += scaleX, pd->srcPoint.x++) {
+			if (!mask || (msk && (pd->ink == kInkTypeMask ? *msk++ : !(*msk++)))) {
 			inkDrawPixel(pd->destRect.left + xCtr, pd->destRect.top + i,
 									 preprocessColor(pd, *((byte *)pd->srf->getBasePtr(scaleXCtr / SCALE_THRESHOLD, scaleYCtr / SCALE_THRESHOLD))), pd);
+			}
 		}
 	}
 }


Commit: cb40fe606e44d4f853637eac202211ee49016be3
    https://github.com/scummvm/scummvm/commit/cb40fe606e44d4f853637eac202211ee49016be3
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-24T08:46:25-04:00

Commit Message:
DIRECTOR: Remove extra comparisons from blitter

Changed paths:
    engines/director/stage.cpp


diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index bb21d822f1..62c4bddfd2 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -252,16 +252,17 @@ void Stage::inkBlitSurface(DirectorPlotData *pd, Common::Rect &srcRect, const Gr
 	if (pd->sprite == kTextSprite)
 		pd->applyColor = false;
 
-	pd->srcPoint.y = MAX(abs(srcRect.top - pd->destRect.top), 0);
+	pd->srcPoint.y = abs(srcRect.top - pd->destRect.top);
 	for (int i = 0; i < pd->destRect.height(); i++, pd->srcPoint.y++) {
-		pd->srcPoint.x = MAX(abs(srcRect.left - pd->destRect.left), 0);
+		pd->srcPoint.x = abs(srcRect.left - pd->destRect.left);
 		const byte *msk = mask ? (const byte *)mask->getBasePtr(pd->srcPoint.x, pd->srcPoint.y) : nullptr;
 
-		for (int j = 0; j < pd->destRect.width(); j++, pd->srcPoint.x++)
+		for (int j = 0; j < pd->destRect.width(); j++, pd->srcPoint.x++) {
 			if (!mask || (msk && (pd->ink == kInkTypeMask ? *msk++ : !(*msk++)))) {
 				inkDrawPixel(pd->destRect.left + j, pd->destRect.top + i,
 										 preprocessColor(pd, *((byte *)pd->srf->getBasePtr(pd->srcPoint.x, pd->srcPoint.y))), pd);
 			}
+		}
 	}
 }
 
@@ -276,10 +277,10 @@ void Stage::inkBlitStretchSurface(DirectorPlotData *pd, Common::Rect &srcRect, c
 	int scaleX = SCALE_THRESHOLD * srcRect.width() / pd->destRect.width();
 	int scaleY = SCALE_THRESHOLD * srcRect.height() / pd->destRect.height();
 
-	pd->srcPoint.y = MAX(abs(srcRect.top - pd->destRect.top), 0);
+	pd->srcPoint.y = abs(srcRect.top - pd->destRect.top);
 
 	for (int i = 0, scaleYCtr = 0; i < pd->destRect.height(); i++, scaleYCtr += scaleY, pd->srcPoint.y++) {
-		pd->srcPoint.x = MAX(abs(srcRect.left - pd->destRect.left), 0);
+		pd->srcPoint.x = abs(srcRect.left - pd->destRect.left);
 		const byte *msk = mask ? (const byte *)mask->getBasePtr(pd->srcPoint.x, pd->srcPoint.y) : nullptr;
 
 		for (int xCtr = 0, scaleXCtr = 0; xCtr < pd->destRect.width(); xCtr++, scaleXCtr += scaleX, pd->srcPoint.x++) {


Commit: b54767434188242c65ffccbdd479d64f27e7038a
    https://github.com/scummvm/scummvm/commit/b54767434188242c65ffccbdd479d64f27e7038a
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-24T08:53:32-04:00

Commit Message:
DIRECTOR: Initialize variable

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index bf39466ab7..643a9f0356 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -65,6 +65,7 @@ Score::Score(Movie *movie) {
 	_currentLabel = 0;
 	_nextFrameTime = 0;
 	_waitForChannel = 0;
+	_activeFade = 0;
 	_playState = kPlayNotStarted;
 
 	_numChannelsDisplayed = 0;