From 4cffb1c65fe9a1d8665d3303be8cb6f3acc1494d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 18:08:06 -0400
Subject: SHERLOCK: Simplify rect check in addDirtyRect

---
 engines/sherlock/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sherlock/screen.cpp')

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index fb155bf502..4cc3ba92e7 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -161,7 +161,7 @@ void Screen::fadeIn(const byte palette[PALETTE_SIZE], int speed) {
  */
 void Screen::addDirtyRect(const Common::Rect &r) {
 	_dirtyRects.push_back(r);
-	assert(r.isValidRect() && r.width() > 0 && r.height() > 0);
+	assert(r.width() > 0 && r.height() > 0);
 }
 
 /**
-- 
cgit v1.2.3


From f987cda9f06e66962fb84b68fe060970c21d071f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 21:39:08 -0400
Subject: SHERLOCK: Properly clear screen after fading to black

---
 engines/sherlock/screen.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/sherlock/screen.cpp')

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 4cc3ba92e7..38bbb93800 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -141,6 +141,7 @@ void Screen::fadeToBlack(int speed) {
 	}
 
 	setPalette(tempPalette);
+	fillRect(Common::Rect(0, 0, this->w, this->h), 0);
 }
 
 /**
-- 
cgit v1.2.3


From 95ce29ac7470435dbec167df526cf4ff38fc8805 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 May 2015 20:44:12 -0400
Subject: SHERLOCK: Fix random pixel transitions, and make it the default fade
 style

---
 engines/sherlock/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sherlock/screen.cpp')

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 38bbb93800..cbf18f146f 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -217,7 +217,7 @@ void Screen::randomTransition() {
 		if (offset < (SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT))
 			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer->getPixels() + offset);
 
-		if (idx != 0 && (idx % 100) == 0) {
+		if (idx != 0 && (idx % 300) == 0) {
 			// Ensure there's a full screen dirty rect for the next frame update
 			if (_dirtyRects.empty())
 				addDirtyRect(Common::Rect(0, 0, this->w, this->h));
-- 
cgit v1.2.3