[Scummvm-cvs-logs] SF.net SVN: scummvm:[51204] scummvm/trunk/engines/sci/graphics/ports.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Jul 23 14:37:59 CEST 2010


Revision: 51204
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51204&view=rev
Author:   m_kiewitz
Date:     2010-07-23 12:37:58 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
SCI: fixing kNewWindow (SCI1.1)

check differently for null restoreRect, fixes pq3 some windows not getting fully removed
calling showBits on actual dims and not on restoreRect, fixes lb2 about window issues (and possible qfg1vga window issues as well)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/ports.cpp

Modified: scummvm/trunk/engines/sci/graphics/ports.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/ports.cpp	2010-07-23 12:09:54 UTC (rev 51203)
+++ scummvm/trunk/engines/sci/graphics/ports.cpp	2010-07-23 12:37:58 UTC (rev 51204)
@@ -173,7 +173,7 @@
 reg_t GfxPorts::kernelNewWindow(Common::Rect dims, Common::Rect restoreRect, uint16 style, int16 priority, int16 colorPen, int16 colorBack, const char *title) {
 	Window *wnd = NULL;
 
-	if (restoreRect.top != 0 && restoreRect.left != 0 && restoreRect.height() != 0 && restoreRect.width() != 0)
+	if (restoreRect.bottom != 0 && restoreRect.right != 0)
 		wnd = newWindow(dims, &restoreRect, title, style, priority, false);
 	else
 		wnd = newWindow(dims, NULL, title, style, priority, false);
@@ -367,7 +367,7 @@
 		if (!(wndStyle & SCI_WINDOWMGR_STYLE_TRANSPARENT))
 			_paint16->fillRect(r, GFX_SCREEN_MASK_VISUAL, pWnd->backClr);
 
-		_paint16->bitsShow(pWnd->restoreRect);
+		_paint16->bitsShow(pWnd->dims);
 	}
 	setPort(oldport);
 }


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




More information about the Scummvm-git-logs mailing list