Ticket #619: sammax_651077.diff

scumm/palette.cpp

@@ -606 +606 @@
         }
 
         if (_gameId == GID_SAMNMAX) {
-                for (i = 0; i < 256; i++)
+                for (i = 0; i < 256; i++) {
                         _shadowPalette[i] = i;
+                }
+                for (i = start; i < end; i++) {
+                        int r = (int) ((pal[0] >> 2) * redScale) >> 8;
+                        int g = (int) ((pal[1] >> 2) * greenScale) >> 8;
+                        int b = (int) ((pal[2] >> 2) * blueScale) >> 8;
+                        pal += 3;
+
+                        uint8 bestitem = 0;
+                        uint bestsum = 32000;
+
+                        compareptr = basepal + startColor * 3;
+                        for (int j = startColor; j <= endColor; j++, compareptr += 3) {
+                                int ar = compareptr[0] >> 2;
+                                int ag = compareptr[1] >> 2;
+                                int ab = compareptr[2] >> 2;
+                        
+                                uint sum = ABS(ar - r) + ABS(ag - g) + ABS(ab - b);
+
+                                if (sum < bestsum) {
+                                        bestsum = sum;
+                                        bestitem = j;
+                                }
+                        }
+                        *table++ = bestitem;
+                }
+                return;
         }
 
         for (i = start; i < end; i++) {