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

[m_kiewitz at users.sourceforge.net]

Revision: 45162
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45162&view=rev
Author:   m_kiewitz
Date:     2009-10-16 11:46:18 +0000 (Fri, 16 Oct 2009)

Log Message:
-----------
SCI/newgui: addToPic priority issue fixed (lsl5 dream sequences)

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

Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-16 11:43:37 UTC (rev 45161)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-16 11:46:18 UTC (rev 45162)
@@ -61,7 +61,7 @@
 	_EGApaletteNo = EGApaletteNo;
 	_priority = 0;
 
-	if (READ_LE_UINT16(_resource->data) == 0x26) {
+ 	if (READ_LE_UINT16(_resource->data) == 0x26) {
 		// SCI 1.1 VGA picture
 		drawSci11Vga();
 	} else {
@@ -467,6 +467,7 @@
 				case PIC_OPX_EGA_EMBEDDED_VIEW:
 					vectorGetAbsCoords(data, curPos, x, y);
 					size = READ_LE_UINT16(data + curPos); curPos += 2;
+					_priority = pic_priority; // set global priority so the cel gets drawn using current priority as well
 					drawCelData(data, _resource->size, curPos, curPos + 8, 0, x, y);
 					curPos += size;
 					break;
@@ -495,6 +496,7 @@
 				case PIC_OPX_VGA_EMBEDDED_VIEW: // draw cel
 					vectorGetAbsCoords(data, curPos, x, y);
 					size = READ_LE_UINT16(data + curPos); curPos += 2;
+					_priority = pic_priority; // set global priority so the cel gets drawn using current priority as well
 					drawCelData(data, _resource->size, curPos, curPos + 8, 0, x, y);
 					curPos += size;
 					break;


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