Ticket #8061: painting.diff

scummvm/scumm/gfx.cpp

@@ -2661 +2661 @@
         ap[2] = bp[2];
         bp[2] = t;
 
-        setDirtyColors(a, b);
+        setDirtyColors(a, a);
+        setDirtyColors(b, b);
+}
+
+void Scumm::copyPalColor(int dst, int src)
+{
+        byte *dp, *sp;
+
+        if ((uint) dst >= 256 || (uint) src >= 256)
+                error("copyPalColor: invalid values, %d, %d", dst, src);
+
+        dp = &_currentPalette[dst * 3];
+        sp = &_currentPalette[src * 3];
+
+        dp[0] = sp[0];
+        dp[1] = sp[1];
+        dp[2] = sp[2];
+
+        setDirtyColors(dst, dst);
 }
 
 void Gdi::resetBackground(int top, int bottom, int strip)

scummvm/scumm/script_v2.cpp

@@ -2908 +2908 @@
                         break;
 
                 case 123:
-                        swapPalColors(args[1], args[2]);
+                        copyPalColor(args[2], args[1]);
                         break;
 
                 case 124:                                                                       /* samnmax */
@@ -2932 +2932 @@
 
         switch (args[0]) {
         case 113:
-                // Do something to [1] x [2] (x/y)
-                warning("o6_kernelFunction: stub113(%d,%d)", args[1], args[2]);
-                push(0);
+                // This is used for the Sam & Max paint-by-numbers mini-game
+                // to find out what color to change. I think that what we have
+                // the virtual mouse coordinates, because that's what used
+                // everywhere else in the script.
+
+                if (args[1] != -1 && args[2] != -1) {
+                        VirtScreen *vs = &virtscr[0];
+                        push(vs->screenPtr[args[1] + args[2] * vs->width]);
+                } else
+                        push(0);
                 break;
         case 115:
                 push(getSpecialBox(args[1], args[2]));

scummvm/scumm/scumm.h

@@ -797 +797 @@
         void setDirtyColors(int min, int max);
         byte *findPalInPals(byte *pal, int index);
         void swapPalColors(int a, int b);
+        void copyPalColor(int dst, int src);
         void cyclePalette();
         void stopCycle(int i);
         void palManipulateInit(int start, int end, int string_id, int time);