[Scummvm-cvs-logs] scummvm master -> 803969b928f85254e4518c44f20455ab0fdd7065

dreammaster dreammaster at scummvm.org
Fri Jul 31 14:34:06 CEST 2015


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:
803969b928 SHERLOCK: RT: Fix rendering of of scene masks


Commit: 803969b928f85254e4518c44f20455ab0fdd7065
    https://github.com/scummvm/scummvm/commit/803969b928f85254e4518c44f20455ab0fdd7065
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-31T08:33:19-04:00

Commit Message:
SHERLOCK: RT: Fix rendering of of scene masks

Changed paths:
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 77f2dc6..36f00f3 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -655,7 +655,9 @@ void TattooUserInterface::doBgAnimEraseBackground() {
 	static const int16 OFFSETS[16] = { -1, -2, -3, -3, -2, -1, -1, 0, 1, 2, 3, 3, 2, 1, 0, 0 };
 
 	if (_mask != nullptr) {
-		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+		// Since a mask is active, restore the screen from the secondary back buffer prior to applying the mask
+		screen._backBuffer1.blitFrom(screen._backBuffer2, screen._currentScroll, Common::Rect(screen._currentScroll.x, 0, 
+			screen._currentScroll.x + SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
 		switch (scene._currentScene) {
 		case 7:






More information about the Scummvm-git-logs mailing list