Ticket #7990: noir.diff

scummvm/gfx.cpp

@@ -2359 +2359 @@
         }
 }
 
+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/script_v2.cpp

@@ -2836 +2836 @@
                         createSpecialPalette(args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
                         break;
 
-                case 114:                                                                       /* palette? */
-                        warning("stub o6_miscOps_114()");
+                case 114:
+                        // Sam & Max film noir mode
+                        if (_gameId == GID_SAMNMAX)
+                                desaturatePalette();
+                        else
+                                warning("stub o6_miscOps_114()");
                         break;
 
                 case 117:

scummvm/scumm.h

@@ -880 +880 @@
         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/scummvm.cpp

@@ -1376 +1376 @@
         int i;
         byte *data = _currentPalette + first * 3;
 
+        // Sam & Max film noir mode
+        if (_gameId == GID_SAMNMAX && readVar(0x8000))
+                desaturatePalette();
+        
         byte palette_colors[1024],*p = palette_colors;
         
         for (i = 0; i != num; i++, data += 3, p+=4) {