[Scummvm-cvs-logs] SF.net SVN: scummvm:[43711] scummvm/trunk/engines/sci

[waltervn at users.sourceforge.net]

Revision: 43711
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43711&view=rev
Author:   waltervn
Date:     2009-08-24 21:56:54 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
SCI: Reverted r40889. New fix for window erasing issue in SCI1.1 games.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/gfx/gfx_widgets.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-08-24 21:54:16 UTC (rev 43710)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-08-24 21:56:54 UTC (rev 43711)
@@ -2541,7 +2541,7 @@
 
 	// PQ3 and SCI1.1 games have the interpreter store underBits implicitly
 	if (argextra)
-		gfxw_port_auto_restore_background(s->visual, window, gfx_rect(argv[5].toSint16(), argv[4].toSint16(), argv[7].toSint16() - argv[5].toSint16(), argv[6].toSint16() - argv[4].toSint16()));
+		gfxw_port_auto_restore_background(s->visual, window, gfx_rect(argv[5].toSint16(), argv[4].toSint16() + s->wm_port->_bounds.y, argv[7].toSint16() - argv[5].toSint16(), argv[6].toSint16() - argv[4].toSint16()));
 
 	ADD_TO_WINDOW_PORT(window);
 	FULL_REDRAW();

Modified: scummvm/trunk/engines/sci/gfx/gfx_widgets.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_widgets.cpp	2009-08-24 21:54:16 UTC (rev 43710)
+++ scummvm/trunk/engines/sci/gfx/gfx_widgets.cpp	2009-08-24 21:56:54 UTC (rev 43711)
@@ -1753,8 +1753,8 @@
 	// (this one includes equality too)
 	return ((widget->_serial >= free_above_eq || widget->_serial < free_below) &&
 			(snapshot->area.x <= bounds.x && snapshot->area.y <= bounds.y &&
-			 snapshot->area.width >= bounds.width &&
-			 snapshot->area.height >= bounds.height));
+			 snapshot->area.x + snapshot->area.width >= bounds.x + bounds.width &&
+			 snapshot->area.y + snapshot->area.height >= bounds.y + bounds.height));
 }
 
 #define MAGIC_FREE_NUMBER -42


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.