[Scummvm-cvs-logs] scummvm master -> 003afa45a37f17e5d148232bfd35a461901222cc

[eriktorbjorn]

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:
003afa45a3 SHERLOCK: "Fix" corruption in Rose Tatto intro


Commit: 003afa45a37f17e5d148232bfd35a461901222cc
    https://github.com/scummvm/scummvm/commit/003afa45a37f17e5d148232bfd35a461901222cc
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-05T23:55:33+02:00

Commit Message:
SHERLOCK: "Fix" corruption in Rose Tatto intro

It still looks bad, but given the comments it makes more sense to
copy from _backBuffer2 than trying to copy an invalid portion of
the frame.

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



diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 737d986..5f2e198 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -335,7 +335,7 @@ void TattooScene::doBgAnimEraseBackground() {
 						
 			if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) || 
 					obj._type == HIDE_SHAPE || obj._type == REMOVE)
-				screen._backBuffer1.blitFrom(*obj._imageFrame, obj._oldPosition, 
+				screen._backBuffer1.blitFrom(screen._backBuffer2, obj._oldPosition, 
 					Common::Rect(obj._oldPosition.x, obj._oldPosition.y, obj._oldPosition.x + obj._oldSize.x,
 						obj._oldPosition.y + obj._oldSize.y));
 		}