From 719160d4948ccd22d283d5b458cb15622db473f7 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Wed, 25 May 2016 13:59:09 -0500
Subject: SCI32: Fix assertion failures in LSL6 hires caused by bad rects

LSL6 hires sends rectangles to kernel calls that have negative
dimensions. SSCI did not care about this and would simply accept
these invalid rects, so we do the same, at least for now.
---
 engines/sci/graphics/plane32.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/sci/graphics/plane32.h')

diff --git a/engines/sci/graphics/plane32.h b/engines/sci/graphics/plane32.h
index 770a6fa445..53749f86f4 100644
--- a/engines/sci/graphics/plane32.h
+++ b/engines/sci/graphics/plane32.h
@@ -275,7 +275,11 @@ public:
 	 * given screen rect.
 	 */
 	inline void clipScreenRect(const Common::Rect &screenRect) {
-		if (_screenRect.intersects(screenRect)) {
+		// LSL6 hires creates planes with invalid rects; SSCI does not
+		// care about this, but `Common::Rect::clip` does, so we need to
+		// check whether or not the rect is actually valid before clipping
+		// and only clip valid rects
+		if (_screenRect.isValidRect() && _screenRect.intersects(screenRect)) {
 			_screenRect.clip(screenRect);
 		} else {
 			_screenRect.left = 0;
-- 
cgit v1.2.3