diff options
| author | Martin Kiewitz | 2010-08-16 16:50:45 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-08-16 16:50:45 +0000 |
| commit | d8726d8058de846604810f5ab1c1193ea34ff388 (patch) | |
| tree | 40ec156cc346f59fd42bc2e359ebb59e67f00331 /engines | |
| parent | 7b51537be2341b62795c308c140faca387fa04e6 (diff) | |
| download | scummvm-rg350-d8726d8058de846604810f5ab1c1193ea34ff388.tar.gz scummvm-rg350-d8726d8058de846604810f5ab1c1193ea34ff388.tar.bz2 scummvm-rg350-d8726d8058de846604810f5ab1c1193ea34ff388.zip | |
SCI: sci1.1 pictures w/o cel don't set palette
even if one is present in the picture, fixes some transitions looking weird in eq2 - bug #3037126
svn-id: r52125
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/picture.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp index e568316919..2765663381 100644 --- a/engines/sci/graphics/picture.cpp +++ b/engines/sci/graphics/picture.cpp @@ -120,10 +120,6 @@ void GfxPicture::drawSci11Vga() { // [priorityBandData:WORD] * priorityBandCount // [priority:BYTE] [unknown:BYTE] - // Create palette and set it - _palette->createFromData(inbuffer + palette_data_ptr, size - palette_data_ptr, &palette); - _palette->set(&palette, true); - // priority bands are supposed to be 14 for sci1.1 pictures assert(priorityBandsCount == 14); @@ -132,8 +128,13 @@ void GfxPicture::drawSci11Vga() { } // display Cel-data - if (has_cel) + if (has_cel) { + // Create palette and set it + _palette->createFromData(inbuffer + palette_data_ptr, size - palette_data_ptr, &palette); + _palette->set(&palette, true); + drawCelData(inbuffer, size, cel_headerPos, cel_RlePos, cel_LiteralPos, 0, 0, 0); + } // process vector data drawVectorData(inbuffer + vector_dataPos, vector_size); |