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

[npjg]

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:
f75aaf47ed DIRECTOR: Clip drawing areas properly


Commit: f75aaf47edc12a918cdc246128e78daeba22de2a
    https://github.com/scummvm/scummvm/commit/f75aaf47edc12a918cdc246128e78daeba22de2a
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-10T14:23:44-04:00

Commit Message:
DIRECTOR: Clip drawing areas properly

Changed paths:
    engines/director/ink.cpp


diff --git a/engines/director/ink.cpp b/engines/director/ink.cpp
index bc0cc16386..9c2dfccacf 100644
--- a/engines/director/ink.cpp
+++ b/engines/director/ink.cpp
@@ -33,34 +33,31 @@ void Score::inkBasedBlit(Graphics::ManagedSurface *maskSurface, const Graphics::
 	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);
-
 	switch (ink) {
 	case kInkTypeCopy:
-			_surface->transBlitFrom(spriteSurface, Common::Point(drawRect.left, drawRect.top), *maskSurface);
+			_surface->transBlitFrom(spriteSurface, Common::Point(t.left, t.top), *maskSurface);
 		break;
 	case kInkTypeTransparent:
 		// FIXME: is it always white (last entry in pallette)?
-		_surface->transBlitFrom(spriteSurface, Common::Point(drawRect.left, drawRect.top), _vm->getPaletteColorCount() - 1);
+		_surface->transBlitFrom(spriteSurface, Common::Point(t.left, t.top), _vm->getPaletteColorCount() - 1);
 		break;
 	case kInkTypeBackgndTrans:
-		drawBackgndTransSprite(spriteSurface, drawRect, spriteId);
+		drawBackgndTransSprite(spriteSurface, t, spriteId);
 		break;
 	case kInkTypeMatte:
-		drawMatteSprite(spriteSurface, drawRect);
+		drawMatteSprite(spriteSurface, t);
 		break;
 	case kInkTypeGhost:
-		drawGhostSprite(spriteSurface, drawRect);
+		drawGhostSprite(spriteSurface, t);
 		break;
 	case kInkTypeReverse:
-		drawReverseSprite(spriteSurface, drawRect, spriteId);
+		drawReverseSprite(spriteSurface, t, spriteId);
 		break;
 	default:
 		warning("Score::inkBasedBlit(): Unhandled ink type %d", ink);
-		_surface->blitFrom(spriteSurface, Common::Point(drawRect.left, drawRect.top));
+		_surface->blitFrom(spriteSurface, Common::Point(t.left, t.top));
 		break;
 	}