aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-16 11:46:18 +0000
committerMartin Kiewitz2009-10-16 11:46:18 +0000
commit408411f3d1741a6b3c03353144af3ac244f7c3ef (patch)
tree57a10648e5a5fef0df9e8a1fc01bc2fb6aafb53e /engines/sci
parentb190fa358ae537f1b9b089158e9ef031c1c2fef3 (diff)
downloadscummvm-rg350-408411f3d1741a6b3c03353144af3ac244f7c3ef.tar.gz
scummvm-rg350-408411f3d1741a6b3c03353144af3ac244f7c3ef.tar.bz2
scummvm-rg350-408411f3d1741a6b3c03353144af3ac244f7c3ef.zip
SCI/newgui: addToPic priority issue fixed (lsl5 dream sequences)
svn-id: r45162
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/gui/gui_picture.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/gui/gui_picture.cpp b/engines/sci/gui/gui_picture.cpp
index 3c04625516..6e108877cc 100644
--- a/engines/sci/gui/gui_picture.cpp
+++ b/engines/sci/gui/gui_picture.cpp
@@ -61,7 +61,7 @@ void SciGuiPicture::draw(int16 animationNr, bool mirroredFlag, bool addToFlag, i
_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 @@ void SciGuiPicture::drawVectorData(byte *data, int dataSize) {
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 @@ void SciGuiPicture::drawVectorData(byte *data, int dataSize) {
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;