If drawSurface() is called with no clip rect, clip to the screen size. This

prevents the subtitles-only cutscenes fallback from drawing outside the
screen.

svn-id: r19813

1 files changed, 21 insertions, 17 deletions

diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index d1b9a6083c..b2be1dbaaa 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -286,29 +286,33 @@ void Screen::drawSurface(SpriteInfo *s, byte *surface, Common::Rect *clipRect) {
 	rd.top = s->y;
 	rd.bottom = rd.top + rs.bottom;
 
-	if (clipRect) {
-		if (clipRect->left > rd.left) {
-			rs.left += (clipRect->left - rd.left);
-			rd.left = clipRect->left;
-		}
+	Common::Rect defClipRect(0, 0, _screenWide, _screenDeep);
 
-		if (clipRect->top > rd.top) {
-			rs.top += (clipRect->top - rd.top);
-			rd.top = clipRect->top;
-		}
+	if (!clipRect) {
+		clipRect = &defClipRect;
+	}
 
-		if (clipRect->right < rd.right) {
-			rd.right = clipRect->right;
-		}
+	if (clipRect->left > rd.left) {
+		rs.left += (clipRect->left - rd.left);
+		rd.left = clipRect->left;
+	}
 
-		if (clipRect->bottom < rd.bottom) {
-			rd.bottom = clipRect->bottom;
-		}
+	if (clipRect->top > rd.top) {
+		rs.top += (clipRect->top - rd.top);
+		rd.top = clipRect->top;
+	}
 
-		if (rd.width() <= 0 || rd.height() <= 0)
-			return;
+	if (clipRect->right < rd.right) {
+		rd.right = clipRect->right;
 	}
 
+	if (clipRect->bottom < rd.bottom) {
+		rd.bottom = clipRect->bottom;
+	}
+
+	if (rd.width() <= 0 || rd.height() <= 0)
+		return;
+
 	src = surface + rs.top * s->w + rs.left;
 	dst = _buffer + _screenWide * rd.top + rd.left;