Ticket #1502: comi_905833.diff

scumm/palette.cpp

@@ -269 +269 @@
                 }
         }
 
-        if (_heversion >= 90) {
+        if (_heversion >= 90 || _version == 8) {
                 memcpy(_darkenPalette, _currentPalette, 768);
         }
 
@@ -674 +674 @@
                 const byte *palptr;
                 int color, idx, j;
 
-                if (_heversion >= 90) {
+                if (_heversion >= 90 || _version == 8) {
                         palptr = _darkenPalette;
                 } else {
                         palptr = getPalettePtr(_curPalIndex, _roomResource);
@@ -737 +737 @@
                 byte *cur;
                 int j;
 
-                cptr = getPalettePtr(_curPalIndex, _roomResource) + startColor * 3;
+                cptr = _darkenPalette + startColor * 3;
                 cur = _currentPalette + startColor * 3;
 
                 for (j = startColor; j <= endColor; j++) {
@@ -809 +809 @@
         int i;
         int ar, ag, ab;
         uint sum, bestsum, bestitem = 0;
-        byte *pal = _currentPalette;
+        byte *pal = _currentPalette + 24 * 3;
 
         if (r > 255)
                 r = 255;
@@ -824 +824 @@
         g &= ~3;
         b &= ~3;
 
-        for (i = 0; i < 256; i++, pal += 3) {
+        for (i = 24; i < 256; i++, pal += 3) {
                 ar = pal[0] & ~3;
                 ag = pal[1] & ~3;
                 ab = pal[2] & ~3;
@@ -901 +901 @@
         _currentPalette[idx * 3 + 0] = r;
         _currentPalette[idx * 3 + 1] = g;
         _currentPalette[idx * 3 + 2] = b;
+        if (_version == 8) {
+                _darkenPalette[idx * 3 + 0] = r;
+                _darkenPalette[idx * 3 + 1] = g;
+                _darkenPalette[idx * 3 + 2] = b;
+        }
         setDirtyColors(idx, idx);
 }
 

scumm/saveload.cpp

@@ -605 +605 @@
 
                 MK_OBSOLETE(ScummEngine, gdi._transparentColor, sleByte, VER(8), VER(50)),
                 MKARRAY(ScummEngine, _currentPalette[0], sleByte, 768, VER(8)),
+                MKARRAY(ScummEngine, _darkenPalette[0], sleByte, 768, VER(53)),
 
                 // Sam & Max specific palette replaced by _shadowPalette now.
                 MK_OBSOLETE_ARRAY(ScummEngine, _proc_special_palette[0], sleByte, 256, VER(8), VER(33)),
@@ -915 +916 @@
                 s->saveLoadArrayOf(_palManipPalette, 0x300, 1, sleByte);
                 s->saveLoadArrayOf(_palManipIntermediatePal, 0x600, 1, sleByte);
         }
+        
+        // darkenPalette was not saved before V53
+        if (s->isLoading() && savegameVersion < VER(53)) {
+                memcpy(_darkenPalette, _currentPalette, 768);
+        }
 
 
         //

scumm/saveload.h

@@ -45 +45 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 52
+#define CURRENT_VER 53
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead