[Scummvm-cvs-logs] scummvm master -> 27aa19bca78fe921127bc5b547ea0da0aaf7ea74

dreammaster dreammaster at scummvm.org
Fri Jun 12 01:22:33 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:
27aa19bca7 SHERLOCK: Fix memory corruption when displaying map


Commit: 27aa19bca78fe921127bc5b547ea0da0aaf7ea74
    https://github.com/scummvm/scummvm/commit/27aa19bca78fe921127bc5b547ea0da0aaf7ea74
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-11T19:21:17-04:00

Commit Message:
SHERLOCK: Fix memory corruption when displaying map

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 eaabcfc..fa37f67 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -130,7 +130,7 @@ void TattooScene::drawAllShapes() {
 		screen._backBuffer1.transBlitFrom(*_activeCAnim._imageFrame, _activeCAnim._position,
 			(_activeCAnim._flags & 4) >> 1, 0, _activeCAnim._scaleVal);
 
-	screen.setDisplayBounds(Common::Rect(0, 0, screen._backBuffer1.w(), screen._backBuffer1.h()));
+	screen.resetDisplayBounds();
 
 	// Queue drawing of all objects that are set to NORMAL.
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {






More information about the Scummvm-git-logs mailing list