Ticket #8226: spec-palette.diff

scummvm/scumm/costume.cpp

@@ -299 +299 @@
         if (masking || charsetmask) {
                 _mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + _ypos * _numStrips + _vm->_screenStartStrip;
                 _imgbufoffs = _vm->gdi._imgBufOffs[_zbuf];
-                if (!charsetmask && _zbuf != 0)
+                if (!charsetmask && _zbuf != 0) {
                         _mask_ptr += _imgbufoffs;
+                        _imgbufoffs = 0;
+                }
                 _mask_ptr_dest = _mask_ptr + _xpos / 8;
         }
 
         CHECK_HEAP
         if (_shadow_mode) {
-                proc_special((masking << 1) + charsetmask);
+                proc_special((masking << 1) | (charsetmask ? 1 : 0));
                 return b;
         }
 
@@ -1096 +1098 @@
         shadow4 = _shadow_mode & 0x10;
         shadow5 = _shadow_mode & 0x0F;
 
-        mask = _mask_ptr = _mask_ptr_dest;
+        mask = _mask_ptr_dest;
         maskbit = revBitMask[_xpos & 7];
         y = _ypos;
 
-        mask = _mask_ptr_dest;
         dstorg = dst = _backbuff_ptr;
         height = _height2;
         width = _width2;
@@ -1115 +1116 @@
 
         dst = _backbuff_ptr;
 
-        if (mask2 != 0 && mask2 < 3)
-                _imgbufoffs = 0;
-
         if (_docontinue)
                 goto StartPos;
 

scummvm/scumm/gfx.cpp

@@ -3098 +3098 @@
                 int g = (int) (*curPtr++ * greenScale) >> 8;
                 int b = (int) (*curPtr++ * blueScale) >> 8;
 
-                searchPtr = palPtr;
+                searchPtr = palPtr + from * 3;
                 bestResult = 32000;
-                currentIndex = 0;
+                currentIndex = from;
 
                 for (j = from; j < to; j++) {
                         int ar = (*searchPtr++);