[Scummvm-cvs-logs] scummvm master -> 023084f7e7d4005eaa5f74bbca53becf423e9ee6

dreammaster dreammaster at scummvm.org
Mon Jul 6 04:15:35 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:
023084f7e7 SHERLOCK: RT: Simplify restoreBackground


Commit: 023084f7e7d4005eaa5f74bbca53becf423e9ee6
    https://github.com/scummvm/scummvm/commit/023084f7e7d4005eaa5f74bbca53becf423e9ee6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-05T22:14:29-04:00

Commit Message:
SHERLOCK: RT: Simplify restoreBackground

Changed paths:
    engines/sherlock/screen.cpp



diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index b16518c..85d8c7a 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -344,13 +344,8 @@ void Screen::blitFrom3DOcolorLimit(uint16 limitColor) {
 }
 
 void Screen::restoreBackground(const Common::Rect &r) {
-	if (r.width() > 0 && r.height() > 0) {
-		Common::Rect tempRect = r;
-		tempRect.clip(Common::Rect(0, 0, this->w(), SHERLOCK_SCENE_HEIGHT));
-
-		if (tempRect.isValidRect())
-			_backBuffer1.blitFrom(_backBuffer2, Common::Point(tempRect.left, tempRect.top), tempRect);
-	}
+	if (r.width() > 0 && r.height() > 0)
+		_backBuffer1.blitFrom(_backBuffer2, Common::Point(r.left, r.top), r);
 }
 
 void Screen::slamArea(int16 xp, int16 yp, int16 width, int16 height) {






More information about the Scummvm-git-logs mailing list