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

[m_kiewitz at users.sourceforge.net]

Revision: 45635
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45635&view=rev
Author:   m_kiewitz
Date:     2009-11-03 19:43:21 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
SCI/newgui: fixes for statusbar and transitions, so menubar shows up in intro of qfg1ega

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui_transitions.cpp

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-11-03 19:33:31 UTC (rev 45634)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-11-03 19:43:21 UTC (rev 45635)
@@ -300,7 +300,8 @@
 	_gfx->PenColor(colorPen);
 	_gfx->MoveTo(0, 1);
 	_text->Draw_String(text);
-	_gfx->BitsShow(_gfx->_menuRect);
+	if (_screen->_picNotValid == 0)
+		_gfx->BitsShow(_gfx->_menuRect);
 	_gfx->SetPort(oldPort);
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-11-03 19:33:31 UTC (rev 45634)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-11-03 19:43:21 UTC (rev 45635)
@@ -309,7 +309,9 @@
 			continue;
 		pixelRect.left = mask % 320; pixelRect.right = pixelRect.left + 1;
 		pixelRect.top = mask / 320;	pixelRect.bottom = pixelRect.top + 1;
-		copyRectToScreen(pixelRect, blackoutFlag);
+		pixelRect.clip(_picRect);
+		if (!pixelRect.isEmpty())
+			copyRectToScreen(pixelRect, blackoutFlag);
 		if ((stepNr & 0x3FF) == 0) {
 			updateScreenAndWait(5);
 		}
@@ -329,7 +331,9 @@
 			continue;
 		blockRect.left = (mask % 40) << 3; blockRect.right = blockRect.left + 8;
 		blockRect.top = (mask / 40) << 3; blockRect.bottom = blockRect.top + 8;
-		copyRectToScreen(blockRect, blackoutFlag);
+		blockRect.clip(_picRect);
+		if (!blockRect.isEmpty())
+			copyRectToScreen(blockRect, blackoutFlag);
 		if ((stepNr & 7) == 0) {
 			updateScreenAndWait(4);
 		}


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