[Scummvm-git-logs] scummvm master -> 22479483141bef908add0924b19ca153200876a0

[npjg]

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:
a5881863c8 DIRECTOR: Remove unused flag
2247948314 Revert "DIRECTOR: Remove erroneous clip"


Commit: a5881863c819b13398315f1522150ab7bac64c81
    https://github.com/scummvm/scummvm/commit/a5881863c819b13398315f1522150ab7bac64c81
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-10T13:25:35-04:00

Commit Message:
DIRECTOR: Remove unused flag

Changed paths:
    engines/director/ink.cpp


diff --git a/engines/director/ink.cpp b/engines/director/ink.cpp
index 9f28e6b5f4..f36fc41234 100644
--- a/engines/director/ink.cpp
+++ b/engines/director/ink.cpp
@@ -31,7 +31,6 @@ void Score::inkBasedBlit(Graphics::ManagedSurface *maskSurface, const Graphics::
 	// drawRect could be bigger than the spriteSurface. Clip it
 	Common::Rect t(spriteSurface.w, spriteSurface.h);
 	t.moveTo(drawRect.left, drawRect.top);
-	bool nullMask = false;
 
 	maskSurface->transBlitFrom(*_maskSurface, drawRect, Common::Point(0, 0), _stageColor);
 
@@ -63,8 +62,6 @@ void Score::inkBasedBlit(Graphics::ManagedSurface *maskSurface, const Graphics::
 		break;
 	}
 
-	if (nullMask)
-		delete maskSurface;
 }
 
 void Score::drawBackgndTransSprite(const Graphics::Surface &sprite, Common::Rect &drawRect, int spriteId) {


Commit: 22479483141bef908add0924b19ca153200876a0
    https://github.com/scummvm/scummvm/commit/22479483141bef908add0924b19ca153200876a0
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-10T13:25:35-04:00

Commit Message:
Revert "DIRECTOR: Remove erroneous clip"

This reverts commit 26e9290d2721e46b2efc23d97fa9ff89baa6b773.

Changed paths:
    engines/director/ink.cpp


diff --git a/engines/director/ink.cpp b/engines/director/ink.cpp
index f36fc41234..bc0cc16386 100644
--- a/engines/director/ink.cpp
+++ b/engines/director/ink.cpp
@@ -32,6 +32,8 @@ void Score::inkBasedBlit(Graphics::ManagedSurface *maskSurface, const Graphics::
 	Common::Rect t(spriteSurface.w, spriteSurface.h);
 	t.moveTo(drawRect.left, drawRect.top);
 
+	drawRect.clip(Common::Rect(_maskSurface->w, _maskSurface->h));
+
 	maskSurface->transBlitFrom(*_maskSurface, drawRect, Common::Point(0, 0), _stageColor);
 
 	drawRect.clip(t);