[Scummvm-git-logs] scummvm master -> 49bd8da037867d348eb0aa4cb25d88549483ce7d

[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:
49bd8da037 Revert "DIRECTOR: Do not clip drawRect to maskSurface"


Commit: 49bd8da037867d348eb0aa4cb25d88549483ce7d
    https://github.com/scummvm/scummvm/commit/49bd8da037867d348eb0aa4cb25d88549483ce7d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-02T12:43:50+02:00

Commit Message:
Revert "DIRECTOR: Do not clip drawRect to maskSurface"

This reverts commit 84cb2c995558326b633811f63dc980f884088334.

This crashes warlock ASTERODS/BBSIDEL.MMM

Changed paths:
    engines/director/ink.cpp


diff --git a/engines/director/ink.cpp b/engines/director/ink.cpp
index 80a1d5b575..1b7fb2bd00 100644
--- a/engines/director/ink.cpp
+++ b/engines/director/ink.cpp
@@ -41,6 +41,9 @@ void Score::inkBasedBlit(Graphics::ManagedSurface *maskSurface, const Graphics::
 		maskSurface->clear(0);
 	}
 
+	drawRect.clip(Common::Rect(_maskSurface->w, _maskSurface->h));
+
+
 	if (drawRect.isEmpty()) {
 		warning("Score::inkBasedBlit(): empty drawRect");
 		return;