Ticket #8002: greatloom2.diff

scummvm/gfx.cpp

@@ -446 +446 @@
                 }
         }
 
+        if (_features & GF_SMALL_HEADER)
+                memcpy(_backupPalette, _currentPalette, sizeof(_backupPalette));
+        
         setDirtyColors(0, numcolor - 1);
 }
 

scummvm/script_v1.cpp

@@ -1922 +1922 @@
                                 b = getVarOrDirectWord(0x40);
                         }
                         checkRange(256, 0, a, "o5_roomOps: 2: Illegal room color slot (%d)");
-                        _shadowPalette[a] = b;
-                        //        _fullRedraw = 1;
+                        c = _backupPalette[a * 3 + 0];
+                        d = _backupPalette[a * 3 + 1];
+                        e = _backupPalette[a * 3 + 2];
+                        setPalColor(b, c, d, e);        /* index, r, g, b */
                 } else {
                         a = getVarOrDirectWord(0x80);
                         b = getVarOrDirectWord(0x40);

scummvm/scumm.h

@@ -955 +955 @@
         byte *_shadowPalette;
         int _shadowPaletteSize;
         byte _currentPalette[0x300];
+        byte _backupPalette[0x300];
 
         byte _proc_special_palette[256];
         int _palDirtyMin, _palDirtyMax;