[Scummvm-cvs-logs] scummvm master -> fe552696533e47b79d1299c831dfda98de884b01

dreammaster dreammaster at scummvm.org
Sun Jan 1 10:15:08 CET 2012


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:
fe55269653 TSAGE: Bugfix for trying to draw off screen objects, which was causing invalid dirty rects


Commit: fe552696533e47b79d1299c831dfda98de884b01
    https://github.com/scummvm/scummvm/commit/fe552696533e47b79d1299c831dfda98de884b01
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2012-01-01T01:14:37-08:00

Commit Message:
TSAGE: Bugfix for trying to draw off screen objects, which was causing invalid dirty rects

Changed paths:
    engines/tsage/graphics.cpp



diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index af3a2f9..4db8986 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -595,7 +595,8 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 	if (destBounds.bottom > destSurface.h)
 		destBounds.bottom = destSurface.h;
 
-	if (destBounds.isValidRect()) {
+	if (destBounds.isValidRect() && !((destBounds.right < 0) || (destBounds.bottom < 0)
+			|| (destBounds.left >= SCREEN_WIDTH) || (destBounds.top >= SCREEN_HEIGHT))) {
 		// Register the affected area as dirty
 		addDirtyRect(destBounds);
 






More information about the Scummvm-git-logs mailing list