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

[thebluegr at users.sourceforge.net]

Revision: 40889
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40889&view=rev
Author:   thebluegr
Date:     2009-05-25 13:25:31 +0000 (Mon, 25 May 2009)

Log Message:
-----------
Fixed a nasty bug in the GUI code, which caused the windows in PQ3 and SCI1.1 games to be erased incorrectly

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-05-25 12:47:58 UTC (rev 40888)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-25 13:25:31 UTC (rev 40889)
@@ -2477,7 +2477,7 @@
 	gfx_color_t black;
 	gfx_color_t lWhite;
 	int priority;
-	int argextra = argc == 13 ? 4 : 0; // Triggers in PQ3
+	int argextra = argc == 13 ? 4 : 0; // Triggers in PQ3 and SCI1.1 games
 
 	y = SKPV(0);
 	x = SKPV(1);
@@ -2530,8 +2530,7 @@
 							s->titlebar_port->_font, lWhite, black, argv[4 + argextra].segment ?
 							kernel_dereference_char_pointer(s, argv[4 + argextra], 0) : NULL, flags);
 
-	// PQ3 has the interpreter store underBits implicitly.
-	// The feature was promptly removed after its release, never to be seen again.
+	// PQ3 and SCI1.1 games have the interpreter store underBits implicitly
 	if (argextra)
 		gfxw_port_auto_restore_background(s->visual, window, gfx_rect(SKPV(5), SKPV(4), SKPV(7) - SKPV(5), SKPV(6) - SKPV(4)));
 

Modified: scummvm/trunk/engines/sci/gfx/gfx_widgets.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_widgets.cpp	2009-05-25 12:47:58 UTC (rev 40888)
+++ scummvm/trunk/engines/sci/gfx/gfx_widgets.cpp	2009-05-25 13:25:31 UTC (rev 40889)
@@ -1782,8 +1782,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.x + snapshot->area.width >= bounds.x + bounds.width &&
-			 snapshot->area.y + snapshot->area.height >= bounds.y + bounds.height));
+			 snapshot->area.width >= bounds.width &&
+			 snapshot->area.height >= 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.