Ticket #8097: noir-fix.diff

scummvm/scumm/gfx.cpp

@@ -2833 +2833 @@
         }
 }
 
-void Scumm::desaturatePalette()
-{
-        // FIXME: Should this be made to take a range of colors instead?
-
-        byte *cur;
-        int i;
-
-        cur = _currentPalette;
-
-        for (i = 0; i <= 255; i++)
-        {
-                int max, min;
-                int brightness;
-
-                // An algorithm that is good enough for The GIMP should be
-                // good enough for us...
-
-                max = (cur[0] > cur[1]) ? cur[0] : cur[1];
-                if (cur[2] > max)
-                        max = cur[2];
-
-                min = (cur[0] < cur[1]) ? cur[0] : cur[1];
-                if (cur[2] < min)
-                        min = cur[2];
-
-                brightness = (min + max) / 2;
-
-                *cur++ = brightness;
-                *cur++ = brightness;
-                *cur++ = brightness;
-        }
-
-        setDirtyColors(0, 255);
-}
-
 void Scumm::grabCursor(int x, int y, int w, int h)
 {
         VirtScreen *vs = findVirtScreen(y);

scummvm/scumm/script_v2.cpp

@@ -2936 +2936 @@
                                 // At this point ScummVM will already have set
                                 // variable 0x8000 to indicate that the game is
                                 // in film noir mode. All we have to do here is
-                                // to mark the palette as "dirty", and the next
-                                // call to updatePalette() will take care of
-                                // the rest.
+                                // to mark the palette as "dirty", because
+                                // updatePalette() will desaturate the colors
+                                // as they are uploaded to the backend.
                                 //
-                                // Actually, for extra bug-compatibility we
-                                // should call desaturatePalette() here only,
-                                // instead of in updatePalette(). To see the
-                                // difference in behaviour, try turning on film
-                                // noir mode in Sam & Max's office. The
-                                // background will be grayscale, but Sam and
-                                // Max themselves will be in color.
+                                // This actually works better than the original
+                                // interpreter, where actors would sometimes
+                                // still be drawn in color.
                                 setDirtyColors(0, 255);
                         } else
                                 warning("stub o6_miscOps_114()");

scummvm/scumm/scumm.h

@@ -816 +816 @@
         void moveMemInPalRes(int start, int end, byte direction);
         void setupShadowPalette(int slot, int rfact, int gfact, int bfact, int from, int to);
         void darkenPalette(int a, int b, int c, int d, int e);
-        void desaturatePalette();
 
         void setShake(int mode);
 

scummvm/scumm/scummvm.cpp

@@ -1426 +1426 @@
 void Scumm::updatePalette() {
         if (_palDirtyMax == -1)
                 return;
-        
+
+        bool noir_mode = (_gameId == GID_SAMNMAX && readVar(0x8000));
         int first = _palDirtyMin;
         int num = _palDirtyMax - first + 1;
         int i;
 
         byte palette_colors[1024],*p = palette_colors;
 
-        // Sam & Max film noir mode
-        if (_gameId == GID_SAMNMAX && readVar(0x8000))
-                desaturatePalette();
-
         for (i = _palDirtyMin; i <= _palDirtyMax; i++) {
                 byte *data;
 
@@ -1445 +1442 @@
                 else
                         data = _currentPalette + i * 3;
 
-                *p++ = data[0];
-                *p++ = data[1];
-                *p++ = data[2];
-                *p++ = 0;
+                // Sam & Max film noir mode. Convert the colours to grayscale
+                // before uploading them to the backend.
 
+                if (noir_mode) {
+                        double r, g, b;
+                        double brightness;
+
+                        r = (double) data[0];
+                        g = (double) data[1];
+                        b = (double) data[2];
+
+                        brightness = (0.299 * r + 0.587 * g + 0.114 * b) + 0.5;
+
+                        *p++ = (byte) brightness;
+                        *p++ = (byte) brightness;
+                        *p++ = (byte) brightness;
+                        *p++ = 0;
+                } else {
+                        *p++ = data[0];
+                        *p++ = data[1];
+                        *p++ = data[2];
+                        *p++ = 0;
+                }
         }
         
         _system->set_palette(palette_colors, first, num);