Ticket #1502: theater.diff

scumm/palette.cpp

@@ -147 +147 @@
                 }
         }
         setDirtyColors(0, numcolor - 1);
+        if (_version == 8) {
+                memcpy(_currentOpPalette, _currentPalette, numcolor * 3);
+        }
 }
 
 void ScummEngine::setDirtyColors(int min, int max) {
@@ -532 +535 @@
                 const byte *cptr;
                 const byte *palptr;
                 int color, idx, j;
-
-                palptr = getPalettePtr(_curPalIndex, _roomResource);
+                
+                if (_version == 8) {
+                        palptr = _currentOpPalette;
+                } else {
+                        palptr = getPalettePtr(_curPalIndex, _roomResource);
+                }
+        
+                // WORKAROUND bug #905833
+                if (_gameId == GID_CMI && (_currentRoom == 20 || _currentRoom == 18) && startColor == 24) {
+                        startColor = 0;
+                }
+                
                 for (j = startColor; j <= endColor; j++) {
                         idx = (_heversion == 70) ? _HEV7ActorPalette[j] : j;
                         cptr = palptr + idx * 3;
@@ -585 +598 @@
  * walks from the beach towards the swamp.
  */
 void ScummEngine::desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor) {
-
+debug(0, "desaturatePalette(%d, %d)", startColor, endColor);
         if (startColor <= endColor) {
                 const byte *cptr;
                 byte *cur;
                 int j;
 
-                cptr = getPalettePtr(_curPalIndex, _roomResource) + startColor * 3;
+                if (_version == 8) {
+                        cptr = _currentOpPalette;
+                } else {
+                        cptr = getPalettePtr(_curPalIndex, _roomResource);
+                }
+                
+                cptr += startColor * 3;
                 cur = _currentPalette + startColor * 3;
 
                 for (j = startColor; j <= endColor; j++) {
@@ -754 +773 @@
         _currentPalette[idx * 3 + 0] = r;
         _currentPalette[idx * 3 + 1] = g;
         _currentPalette[idx * 3 + 2] = b;
+        if (_version == 8) {
+                _currentOpPalette[idx * 3 + 0] = r;
+                _currentOpPalette[idx * 3 + 1] = g;
+                _currentOpPalette[idx * 3 + 2] = b;
+        }
         setDirtyColors(idx, idx);
 }
 

scumm/script_v8.cpp

@@ -1240 +1240 @@
                 setScaleSlot(args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
                 break;
         case 22:        // setBannerColors
-//              warning("o8_kernelSetFunctions: setBannerColors(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
+                warning("o8_kernelSetFunctions: setBannerColors(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
                 break;
         case 23:        // setActorChoreLimbFrame
                 a = derefActor(args[1], "o8_kernelSetFunctions:setActorChoreLimbFrame");

scumm/scumm.h

@@ -1067 +1067 @@
 protected:
         int _shadowPaletteSize;
         byte _currentPalette[3 * 256];
+        byte _currentOpPalette[3 * 256]; // v8
 
         int _palDirtyMin, _palDirtyMax;